Merge branch 'master' of https://github.com/scuml/django-mail-panel

Author: scuml

mail_panel/static/debug_toolbar/mail/mail_toolbar.css

@@ -112,11 +112,17 @@
 	color: black;
 }
 
-#djDebug .djm-mail-toolbar #plain_text_message{
-	font-family: sans-serif;
+#djDebug .djm-mail-toolbar #plain_text_message,
+#djDebug .djm-mail-toolbar #raw_message{
 	font-size: 12px;
 	margin: 10px 0px;
 }
+#djDebug .djm-mail-toolbar #plain_text_message{
+	font-family: sans-serif;
+}
+#djDebug .djm-mail-toolbar #raw_message{
+	font-family: monospace;
+}
 #djDebug .djm-mail-toolbar span.djm-attachment-group{
 	margin-right: 10px;
 	cursor: pointer;

mail_panel/templates/mail_panel/raw_message.html

@@ -0,0 +1,9 @@
+{% load static %}
+<link rel="stylesheet" href="{% static 'debug_toolbar/mail/mail_toolbar.css' %}" type="text/css"/>
+<div id='djDebug'>
+<div class='djm-mail-toolbar'>
+<div id='raw_message'>
+<pre>{{body|linebreaksbr}}</pre>
+</div>
+</div>
+</div>

mail_panel/views.py

@@ -20,7 +20,7 @@ def load_message(request, message_id):
     mail_list = load_outbox()
     message = mail_list.get(message_id, None)
 
-    alternatives = list()
+    alternatives = ["message/rfc822"]
     if message:
         message.read = True
 
@@ -52,19 +52,23 @@ def display_multipart(request, message_id, multipart):
         return HttpResponse('Messsage has expired from cache.')
 
     if multipart not in ('', 'text/plain'):
-        if hasattr(message, "alternatives"):
+        if multipart == "message/rfc822":
+            return render(request, "mail_panel/raw_message.html", dict(
+                body=message.message().as_string())
+            )
+        elif hasattr(message, "alternatives"):
             for alternative in message.alternatives:
                 if alternative[1] == multipart:
-                    body = mark_safe(alternative[0].replace("<a ", "<a target='_blank'"))
+                    body = mark_safe(alternative[0].replace("<a ", "<a target='_blank' "))
                     return HttpResponse(body)
         else:
-            body = mark_safe(message.body.replace("<a ", "<a target='_blank'"))
+            body = mark_safe(message.body.replace("<a ", "<a target='_blank' "))
             return HttpResponse(body)
 
 
     return render(request, "mail_panel/plain_text_message.html", dict(
         body=mark_safe(
-            urlize(message.body).replace("<a ", "<a target='_blank'"))
+            urlize(message.body).replace("<a ", "<a target='_blank' "))
     ))