diff --git a/demo/demodesk/config/settings.py b/demo/demodesk/config/settings.py
index 24b9eccc..070f91cb 100644
--- a/demo/demodesk/config/settings.py
+++ b/demo/demodesk/config/settings.py
@@ -207,3 +207,8 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 # - This is only necessary to make the demo project work, not needed for
 # your own projects unless you make your own fixtures
 FIXTURE_DIRS = [os.path.join(BASE_DIR, 'fixtures')]
+
+try:
+    from .local_settings import *
+except ImportError:
+    pass
diff --git a/helpdesk/management/commands/get_email.py b/helpdesk/management/commands/get_email.py
index 476c7d89..5b2c2036 100755
--- a/helpdesk/management/commands/get_email.py
+++ b/helpdesk/management/commands/get_email.py
@@ -340,13 +340,14 @@ def ticket_from_message(message, queue, logger):
             if not name:
                 ext = mimetypes.guess_extension(part.get_content_type())
                 name = "part-%i%s" % (counter, ext)
-
             payload = part.get_payload()
+            if isinstance(payload, list):
+                payload = payload.pop().as_string()
             payloadToWrite = payload
             try:
                 logger.debug("Try to base64 decode the attachment payload")
                 payloadToWrite = base64.decodestring(payload)
-            except binascii.Error:
+            except binascii.Error, TypeError:
                 logger.debug("Payload was not base64 encoded, using raw bytes")
                 payloadToWrite = payload
             files.append(SimpleUploadedFile(name, part.get_payload(decode=True), mimetypes.guess_type(name)[0]))