diff --git a/data/prosody/configuration/prosody.cfg.lua b/data/prosody/configuration/prosody.cfg.lua
index 3c12a2f..0c2eaf6 100644
--- a/data/prosody/configuration/prosody.cfg.lua
+++ b/data/prosody/configuration/prosody.cfg.lua
@@ -21,6 +21,7 @@ modules_enabled = {
 	"time";
 	"ping";
 	"register";
+	"mam";
 
 	-- Admin interface
 	"admin_adhoc";
@@ -62,6 +63,9 @@ s2s_require_encryption = true
 -- Authentication
 authentication = "internal_plain"
 
+-- Message archive settings
+archive_expires_after = "never"
+
 -- Certificates directory (global, before VirtualHost)
 certificates = "/etc/prosody/certs"