From a16acd77ed483fa54ccb26f20859cd542decc897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= <pchmielowski@process-one.net>
Date: Mon, 8 Oct 2018 15:56:44 +0200
Subject: [PATCH] Archive messages with type=normal and pubsub payload (like
 mucsub messages)

---
 src/mod_mam.erl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mod_mam.erl b/src/mod_mam.erl
index 2a43322c8..4581a6daa 100644
--- a/src/mod_mam.erl
+++ b/src/mod_mam.erl
@@ -649,7 +649,8 @@ should_archive(#message{body = Body, subject = Subject,
 		    false;
 		none ->
 		    xmpp:get_text(Body) /= <<>> orelse
-			xmpp:get_text(Subject) /= <<>>
+		    xmpp:get_text(Subject) /= <<>> orelse
+		    xmpp:has_subtag(Pkt, #ps_event{})
 	    end
     end;
 should_archive(_, _LServer) ->