# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1546869731 -3600
# Node ID 7934e2c6b030c6ae2218fe44d8bcb931619b2b45
# Parent  f40b9649e929f483e1d0d0e0a611e1c2f4dc0e5d# Parent  bf92f37de13719f1f8657ff9e35f792ddb0cad11
Merge 0.11->trunk

diff -r f40b9649e929 -r 7934e2c6b030 plugins/mod_csi_simple.lua
--- a/plugins/mod_csi_simple.lua	Sun Jan 06 12:20:57 2019 +0100
+++ b/plugins/mod_csi_simple.lua	Mon Jan 07 15:02:11 2019 +0100
@@ -63,8 +63,23 @@
 		if st_type == "headline" then
 			return false;
 		end
-		local body = stanza:get_child_text("body");
-		return body;
+		if stanza:get_child("sent", "urn:xmpp:carbons:2") then
+			return true;
+		end
+		local forwarded = stanza:find("{urn:xmpp:carbons:2}received/{urn:xmpp:forward:0}/{jabber:client}message");
+		if forwarded then
+			stanza = forwarded;
+		end
+		if stanza:get_child("body") then
+			return true;
+		end
+		if stanza:get_child("subject") then
+			return true;
+		end
+		if stanza:get_child("encryption", "urn:xmpp:eme:0") then
+			return true;
+		end
+		return false;
 	end
 	return true;
 end, -1);