diff -r 302e3a1a7190 roundup/mailgw.py
--- a/roundup/mailgw.py	Wed Mar 08 22:04:15 2017 -0500
+++ b/roundup/mailgw.py	Fri Mar 10 21:32:50 2017 -0500
@@ -1111,7 +1111,11 @@
             self.msg_props['files'] = files
             if self.nodeid:
                 # extend the existing files list
-                fileprop = self.cl.get(self.nodeid, 'files')
+                if 'files' in self.props:
+                    # email had [files=+322] at end of Subject:
+                    fileprop = self.props['files']
+                else:
+                    fileprop = self.cl.get(self.nodeid, 'files')
                 fileprop.extend(files)
                 files = fileprop
 
@@ -1166,7 +1170,11 @@
 
             if self.nodeid:
                 # add the message to the node's list
-                messages = self.cl.get(self.nodeid, 'messages')
+                if 'messages' in self.props:
+                    # email had [messages=+322] at end of Subject:
+                    messages = self.props['messages']
+                else:
+                    messages = self.cl.get(self.nodeid, 'messages')
                 messages.append(message_id)
                 self.props['messages'] = messages
             else: