diff --git a/helpdesk/models.py b/helpdesk/models.py
index df4b1711..d18614ed 100644
--- a/helpdesk/models.py
+++ b/helpdesk/models.py
@@ -447,8 +447,8 @@ class Ticket(models.Model):
                 self.rfc_2822_items[field] = value
 
         # Submitter Message-Id is an exception here, since it's a <Ticket> attribute
-        if 'rfc_2822_message_id' in kwargs:
-            kwargs['submitter_message_id'] = value
+        if 'rfc_2822_submitter_email_id' in kwargs:
+            kwargs['submitter_email_id'] = kwargs['rfc_2822_submitter_email_id']
 
         for field in self.rfc_2822_items.iterkeys():
             kwargs.pop(field)
diff --git a/helpdesk/tests/test_ticket_submission.py b/helpdesk/tests/test_ticket_submission.py
index 9a2b36ea..821d6043 100644
--- a/helpdesk/tests/test_ticket_submission.py
+++ b/helpdesk/tests/test_ticket_submission.py
@@ -50,7 +50,7 @@ class TicketBasicsTestCase(TestCase):
 
         message_id = uuid.uuid4().hex
 
-        self.ticket_data['rfc_2822_message-id'] = message_id
+        self.ticket_data['rfc_2822_submitter_email_id'] = message_id
 
         email_count = len(mail.outbox)
         ticket_data = dict(queue=self.queue_public, **self.ticket_data)