diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/patches/0008-TT-35053-mod_mam-sipwise_archive.lib-fix-retrieving-incoming.patch b/debian/patches/0008-TT-35053-mod_mam-sipwise_archive.lib-fix-retrieving-incoming.patch
new file mode 100644
index 0000000..8678c6b
--- /dev/null
+++ b/debian/patches/0008-TT-35053-mod_mam-sipwise_archive.lib-fix-retrieving-incoming.patch
@@ -0,0 +1,30 @@
+--- a/plugins/mod_mam/sipwise_archive.lib.lua
++++ b/plugins/mod_mam/sipwise_archive.lib.lua
+@@ -36,7 +36,7 @@
+ 
+ local select_query_base=[[
+ SELECT UuidFromBin(`key`),`stanza`,`epoch`,`with` FROM `sipwise_mam`
+-WHERE `username` = ?
++WHERE (`username` = ? or `with` = ?)
+ ]]
+ 
+ -- Reconnect to DB if necessary
+@@ -100,7 +100,7 @@
+ 	local qstart, qend, qwith = -math.huge, math.huge;
+ 	local qlimit, qid;
+ 	local db_query = select_query_base;
+-	local _params = { username..'@'..host, };
++	local _params = { username..'@'..host, username..'@'..host, };
+ 	local i, values = 0;
+ 
+ 	if query then
+@@ -118,7 +118,8 @@
+ 	end
+ 
+ 	if qwith then
+-		db_query = db_query.." AND `with` = ?";
++		db_query = db_query.." AND (`username` = ? OR `with` = ?)";
++		table.insert(_params, qwith);
+ 		table.insert(_params, qwith);
+ 	end
+ 	if qid then
diff --git a/debian/patches/series b/debian/patches/series
index 81062ec..d0a5233 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ mod_auth_sql.path
 0005-TT-9317-mod_mam-don-t-store-bodyless-chat-messages.patch
 0006-TT-9314-mod_mam-sipwise_archive.lib-support-emojis.patch
 0007-TT-27653-mod_mam-sipwise_archive.lib-fix-uuid-trailing-garbage.patch
+0008-TT-35053-mod_mam-sipwise_archive.lib-fix-retrieving-incoming.patch