diff --git a/sapl/protocoloadm/tests/test_email_templates.py b/sapl/protocoloadm/tests/test_email_templates.py
new file mode 100644
index 000000000..ec79098fa
--- /dev/null
+++ b/sapl/protocoloadm/tests/test_email_templates.py
@@ -0,0 +1,65 @@
+from django.core import mail
+
+from sapl.base.email_utils import enviar_emails, load_email_templates
+
+
+def test_email_template_loading():
+ expected = "Hello Django"
+ emails = load_email_templates(['email/test_tramitacao.html'],
+ context={"name": "Django"})
+
+ # strip \n and \r to compare with expected
+ actual = emails[0].replace('\n', '').replace('\r', '')
+
+ assert actual == expected
+
+
+def test_html_email_body_with_materia():
+ templates = load_email_templates(['email/tramitacao.txt',
+ 'email/tramitacao.html'],
+ {"image": 'img/logo.png',
+ "casa_legislativa":
+ "Assembléia Parlamentar",
+ "data_registro": "25/02/2016",
+ "cod_materia": "1",
+ "descricao_materia": "Assunto de teste",
+ "data": "25/02/2016",
+ "status": "Arquivado",
+ "texto_acao": "Deliberado",
+ "hash_txt": "abc01f",
+ "materia_id": "794",
+ "base_url": "http://localhost:8000",
+ "materia_url":
+ "/docadm/764/acompanhar-documento",
+ "excluir_url":
+ "/docadm/764/acompanhar-excluir"})
+
+ assert len(templates) == 2
+
+
+def test_enviar_email_distintos():
+ NUM_MESSAGES = 10
+ messages = [{'recipient': 'user-' + str(i) + '@test.com',
+ 'subject': 'subject: ' + str(i),
+ 'txt_message': 'txt: ' + str(i),
+ 'html_message': '',
+ } for i in range(NUM_MESSAGES)]
+
+ recipients = [m['recipient'] for m in messages]
+
+ enviar_emails('test@sapl.com', recipients, messages)
+ assert len(mail.outbox) == NUM_MESSAGES
+
+
+def test_enviar_same_email():
+ NUM_MESSAGES = 10
+ messages = [{'recipient': 'user-' + str(i) + '@test.com',
+ 'subject': 'subject: ' + str(i),
+ 'txt_message': 'txt: ' + str(i),
+ 'html_message': '',
+ } for i in range(NUM_MESSAGES)]
+
+ recipients = [m['recipient'] for m in messages]
+
+ enviar_emails('test@sapl.com', recipients, [messages[0]])
+ assert len(mail.outbox) == 1
diff --git a/sapl/templates/email/tramitacao.html b/sapl/templates/email/tramitacao.html
index 4b30a1dc5..362fc563a 100644
--- a/sapl/templates/email/tramitacao.html
+++ b/sapl/templates/email/tramitacao.html
@@ -13,10 +13,12 @@
{{materia}} - {{descricao_materia}}
+{% if autoria %}
Autoria:
{% for autor in autoria %}
{{ autor }}
{% endfor %}
+{% endif %}
diff --git a/sapl/templates/email/tramitacao.txt b/sapl/templates/email/tramitacao.txt
index f0a06687a..bb68a87a0 100644
--- a/sapl/templates/email/tramitacao.txt
+++ b/sapl/templates/email/tramitacao.txt
@@ -8,12 +8,12 @@ A seguinte matéria, de seu interesse, sofreu Tramitação registrada em {{data_
Matéria: {{materia}} - {{descricao_materia}}
{{url_materia}}
-
+{% if autoria %}
Autoria:
{% for autor in autoria %}
{{ autor }}
{% endfor %}
-
+{% endif %}
Data da ação: {{data}}
Status: {{status}}