Build the from address in the task instead of the rest call.

app/celery/tasks.py

@@ -343,6 +343,9 @@ def send_email(service_id, notification_id, from_address, encrypted_notification
                     (provider.get_name(), str(reference), notification['to']), queue='research-mode'
                 )
             else:
+                # First step setting the from_address here rather than the method creating the task
+                from_address = '"{}" <{}@{}>'.format(service.name, service.email_from, current_app.config[
+                    'NOTIFY_EMAIL_DOMAIN']) if from_address == "" else from_address
                 reference = provider.send_email(
                     from_address,
                     notification['to'],

app/notifications/rest.py

@@ -387,7 +387,7 @@ def send_notification(notification_type):
         send_email.apply_async((
             service_id,
             notification_id,
-            '"{}" <{}@{}>'.format(service.name, service.email_from, current_app.config['NOTIFY_EMAIL_DOMAIN']),
+            '',
             encryption.encrypt(notification),
             datetime.utcnow().strftime(DATETIME_FORMAT)
         ), queue='email')

tests/app/notifications/test_rest.py

@@ -946,7 +946,7 @@ def test_should_allow_valid_email_notification(notify_api, sample_email_template
             app.celery.tasks.send_email.apply_async.assert_called_once_with(
                 (str(sample_email_template.service_id),
                  notification_id,
-                 "\"Sample service\" <sample.service@test.notify.com>",
+                 "",
                  "something_encrypted",
                  "2016-01-01T11:09:00.061258"),
                 queue="email"