4 files changed, 76 insertions, 3 deletions

diff --git a/src/mailman/core/runner.py b/src/mailman/core/runner.py
index 81a2ea3d1..de7acdd1c 100644
--- a/src/mailman/core/runner.py
+++ b/src/mailman/core/runner.py
@@ -239,7 +239,7 @@ class Runner:
         if mlist is None:
             language_manager = getUtility(ILanguageManager)
             language = language_manager[config.mailman.default_language]
-        elif msg.sender:
+        elif hasattr(msg, "sender") and msg.sender:
             member = mlist.members.get_member(msg.sender)
             language = (member.preferred_language
                         if member is not None
diff --git a/src/mailman/core/tests/test_runner.py b/src/mailman/core/tests/test_runner.py
index 2875b3b10..06c360fa0 100644
--- a/src/mailman/core/tests/test_runner.py
+++ b/src/mailman/core/tests/test_runner.py
@@ -25,14 +25,16 @@ __all__ = [
     ]
 
 
+import os
 import unittest
+from email.mime.multipart import MIMEMultipart
 
 from mailman.app.lifecycle import create_list
 from mailman.config import config
 from mailman.core.runner import Runner
 from mailman.interfaces.runner import RunnerCrashEvent
 from mailman.testing.helpers import (
-    configuration, event_subscribers, get_queue_messages,
+    configuration, event_subscribers, get_queue_messages, LogFileMark,
     make_testable_runner, specialized_message_from_string as mfs)
 from mailman.testing.layers import ConfigLayer
 
@@ -42,6 +44,11 @@ class CrashingRunner(Runner):
     def _dispose(self, mlist, msg, msgdata):
         raise RuntimeError('borked')
 
+
+class StoringRunner(Runner):
+    _disposed = []
+    def _dispose(self, mlist, msg, msgdata):
+        self._disposed.append((mlist, msg, msgdata))
 
 
 class TestRunner(unittest.TestCase):
@@ -87,3 +94,15 @@ Message-ID: <ant>
         shunted = get_queue_messages('shunt')
         self.assertEqual(len(shunted), 1)
         self.assertEqual(shunted[0].msg['message-id'], '<ant>')
+
+    def test_multipart_message(self):
+        runner = make_testable_runner(StoringRunner, 'in')
+        msg = MIMEMultipart()
+        msg["Message-ID"] = "<ant>"
+        config.switchboards['in'].enqueue(msg, listname='test@example.com')
+        with event_subscribers(self._got_event):
+            runner.run()
+        error_log = LogFileMark('mailman.error')
+        self.assertEqual(len(self._events), 0, error_log.read())
+        self.assertEqual(len(runner._disposed), 1)
+        self.assertEqual(runner._disposed[0][1]["Message-ID"], "<ant>")
diff --git a/src/mailman/handlers/cook_headers.py b/src/mailman/handlers/cook_headers.py
index d5d096448..20ffc390c 100644
--- a/src/mailman/handlers/cook_headers.py
+++ b/src/mailman/handlers/cook_headers.py
@@ -75,7 +75,8 @@ def process(mlist, msg, msgdata):
     # message, we want to save some of the information in the msgdata
     # dictionary for later.  Specifically, the sender header will get waxed,
     # but we need it for the Acknowledge module later.
-    msgdata['original_sender'] = msg.sender
+    if hasattr(msg, "sender"):
+        msgdata['original_sender'] = msg.sender
     # VirginRunner sets _fasttrack for internally crafted messages.
     fasttrack = msgdata.get('_fasttrack')
     if not msgdata.get('isdigest') and not fasttrack:
diff --git a/src/mailman/handlers/tests/test_cook_headers.py b/src/mailman/handlers/tests/test_cook_headers.py
new file mode 100644
index 000000000..1a8fa6cdc
--- /dev/null
+++ b/src/mailman/handlers/tests/test_cook_headers.py
@@ -0,0 +1,53 @@
+# Copyright (C) 2012-2014 by the Free Software Foundation, Inc.
+#
+# This file is part of GNU Mailman.
+#
+# GNU Mailman is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Test the cook_headers handler."""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+__metaclass__ = type
+__all__ = [
+    'TestCookHeaders',
+    ]
+
+
+import unittest
+from email.mime.multipart import MIMEMultipart
+
+from mailman.app.lifecycle import create_list
+from mailman.handlers import cook_headers
+from mailman.testing.layers import ConfigLayer
+
+
+
+class TestCookHeaders(unittest.TestCase):
+    """Test the cook_headers handler."""
+
+    layer = ConfigLayer
+
+    def setUp(self):
+        self._mlist = create_list('test@example.com')
+
+    def test_process_multipart(self):
+        # The digest runner creates MIMEMultipart message instances which have
+        # no sender property.
+        msg = MIMEMultipart()
+        msg["message-id"] = "<test>"
+        try:
+            cook_headers.process(self._mlist, msg, {})
+        except AttributeError as e:
+            self.fail(e)