diff --git a/django_mailbox/models.py b/django_mailbox/models.py
index 33039e0..6a1e771 100644
--- a/django_mailbox/models.py
+++ b/django_mailbox/models.py
@@ -310,7 +310,7 @@ class Mailbox(models.Model):
                 )
         elif (
             settings['strip_unallowed_mimetypes']
-            and not msg.get_content_type() in settings['allowed_mimetypes']
+            and msg.get_content_type() not in settings['allowed_mimetypes']
         ):
             for header, value in msg.items():
                 new[header] = value
@@ -674,10 +674,9 @@ class Message(models.Model):
         message.extra_headers['Date'] = formatdate()
         message.extra_headers['In-Reply-To'] = self.message_id.strip()
         message.send()
+
         return self.mailbox.record_outgoing_message(
-            email.message_from_string(
-                message.message().as_string()
-            )
+            message.message()
         )
 
     @property
diff --git a/setup.cfg b/setup.cfg
index 68ebb70..7b8b376 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,3 +2,8 @@
 norecursedirs=env docs lib .eggs
 DJANGO_SETTINGS_MODULE=django_mailbox.tests.settings
 addopts = --tb=short -rxs
+
+[tool:pytest]
+norecursedirs=env docs lib .eggs
+DJANGO_SETTINGS_MODULE=django_mailbox.tests.settings
+addopts = --tb=short -rxs