1 files changed, 8 insertions, 0 deletions
diff --git a/src/libmime/mime_headers.c b/src/libmime/mime_headers.c
index bb7b9373a..4d2c89dae 100644
--- a/src/libmime/mime_headers.c
+++ b/src/libmime/mime_headers.c
@@ -670,6 +670,14 @@ rspamd_mime_header_decode (rspamd_mempool_t *pool, const gchar *in,
 			if (*p == '?') {
 				state = got_more_qmark;
 				qmarks ++;
+
+				/* Skip multiple ? signs */
+				p ++;
+				while (p < end && *p == '?') {
+					p ++;
+				}
+
+				continue;
 			}
 			p ++;
 			break;