diff --git a/app/main/forms.py b/app/main/forms.py
index 83efd2c9f..04d9e4cc7 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -212,7 +212,7 @@ class SMSTemplateForm(Form):
 
 class EmailTemplateForm(SMSTemplateForm):
 
-    subject = StringField(
+    subject = TextAreaField(
         u'Subject',
         validators=[DataRequired(message="Can’t be empty")])
 
diff --git a/app/templates/views/edit-email-template.html b/app/templates/views/edit-email-template.html
index a27fc5994..b0dcfc11b 100644
--- a/app/templates/views/edit-email-template.html
+++ b/app/templates/views/edit-email-template.html
@@ -15,8 +15,8 @@
     <form method="post">
       <div class="grid-row">
         <div class="column-two-thirds">
-          {{ textbox(form.name, width='1-1', hint='Your recipients won’t see this') }}
-          {{ textbox(form.subject, width='1-1') }}
+          {{ textbox(form.name, width='1-1', hint='Your recipients won’t see this', rows=10) }}
+          {{ textbox(form.subject, width='1-1', rows=2) }}
         </div>
         <div class="column-two-thirds">
           {{ textbox(form.template_content, highlight_tags=True, width='1-1', rows=8) }}