diff --git a/djrill/mail/backends/djrill.py b/djrill/mail/backends/djrill.py
index f44ad02..47da10e 100644
--- a/djrill/mail/backends/djrill.py
+++ b/djrill/mail/backends/djrill.py
@@ -313,6 +313,7 @@ class DjrillBackend(BaseEmailBackend):
         return mandrill_attachment, is_embedded_image
 
     def _filter_msg_dict(self, message, msg_dict):
+        """Filter message data (e.g. clear subject field, or from field)"""
         if hasattr(message, 'clear_from') and message.clear_from:
             msg_dict['from_name'] = ''
             msg_dict['from_email'] = ''
diff --git a/djrill/tests/test_mandrill_send_template.py b/djrill/tests/test_mandrill_send_template.py
index ed987b9..0885241 100644
--- a/djrill/tests/test_mandrill_send_template.py
+++ b/djrill/tests/test_mandrill_send_template.py
@@ -27,6 +27,21 @@ class DjrillMandrillSendTemplateTests(DjrillBackendMockAPITestCase):
                'content': "<p><em>Half off</em> all fruit</p>"} ]
         )
 
+    def test_send_template_without_from_field(self):
+        msg = mail.EmailMessage('Subject', 'Text Body',
+            'from@example.com', ['to@example.com'])
+        msg.template_name = "PERSONALIZED_SPECIALS"
+        msg.clear_from = True
+        msg.clear_subject = True
+        msg.send()
+        self.assert_mandrill_called("/messages/send-template.json")
+        data = self.get_api_call_data()
+        print data
+        self.assertEqual(data['template_name'], "PERSONALIZED_SPECIALS")
+        self.assertEqual(data['message']['subject'], "")
+        self.assertEqual(data['message']['from_email'], "")
+        self.assertEqual(data['message']['from_name'], "")
+
     def test_no_template_content(self):
         # Just a template, without any template_content to be merged
         msg = mail.EmailMessage('Subject', 'Text Body',
diff --git a/docs/usage/templates.rst b/docs/usage/templates.rst
index 74a82ce..beac901 100644
--- a/docs/usage/templates.rst
+++ b/docs/usage/templates.rst
@@ -39,8 +39,6 @@ can be used with templates.
 
 How To Use Default Mandrill Subject and From fields
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. versionadded:: dev
-   Mandrill default fields support
 
 To use default *Mandril* subject or default from field you need send message
 to *Mandril* with empty subject or empty from field. This can be done using