diff --git a/roles/xmpp_server/templates/prosody.cfg.lua.j2 b/roles/xmpp_server/templates/prosody.cfg.lua.j2
index 8a2863c73e0b3e7d3d9b3e4fb6790b9cda2d0f16..17f4c1e63fb2f305083e711d629782532a4cefd4 100644
--- a/roles/xmpp_server/templates/prosody.cfg.lua.j2
+++ b/roles/xmpp_server/templates/prosody.cfg.lua.j2
@@ -19,6 +19,7 @@ modules_enabled = {
     "private"; -- Private XML storage (for room bookmarks, etc.)
     "blocklist"; -- Allow users to block communications with other users
     "vcard"; -- Allow users to set vCards
+    "carbons"; -- Keep multiple clients in sync
 
   -- Nice to have
     "version"; -- Replies to server version requests
@@ -27,6 +28,7 @@ modules_enabled = {
     "ping"; -- Replies to XMPP pings with pongs
     "pep"; -- Enables users to publish their mood, activity, playing music and more
     "register"; -- Allow users to register on this server using a client and change passwords
+    "mam"; -- Store messages in an archive and allow users to access it
 
   -- Admin interfaces
     "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
@@ -83,6 +85,9 @@ ldap_scope = "onelevel"
 ldap_tls = true
 ldap_base = "ou=people,{{ xmpp_ldap_base_dn }}"
 
+-- Message Archives (mod_mam) configuration.
+archive_expires_after = "{{ xmpp_server_archive_expiration }}"
+
 -- Storage backend.
 storage = "internal"