diff --git a/apps/patchwork/bin/parsemail.py b/apps/patchwork/bin/parsemail.py
index b6eb97a..127ff8a 100755
--- a/apps/patchwork/bin/parsemail.py
+++ b/apps/patchwork/bin/parsemail.py
@@ -207,7 +207,10 @@ def find_patch_for_comment(project, mail):
     # construct a list of possible reply message ids
     refs = []
     if 'In-Reply-To' in mail:
-        refs.append(mail.get('In-Reply-To'))
+        irt = re.findall(r"<[^>]+>", mail.get('In-Reply-To'))
+        for r in irt:
+            if r not in refs:
+                refs.append(r)
 
     if 'References' in mail:
         rs = mail.get('References').split()
