Merge pull request #304 from alphagov/add_valid_email_regexes

Add valid email regexes

app/templates/components/textbox.html

@@ -7,7 +7,8 @@
   help_link_text=None,
   width='2-3',
   suffix=None,
-  disabled=False
+  disabled=False,
+  safe_error_message=False
 ) %}
   <div class="form-group{% if field.errors %} error{% endif %}" {% if autofocus %}data-module="autofocus"{% endif %}>
     <label class="form-label" for="{{ field.name }}">
@@ -19,7 +20,7 @@
       {% endif %}
       {% if field.errors %}
         <span class="error-message">
-          {{ field.errors[0] }}
+          {% if not safe_error_message %}{{ field.errors[0] }}{% else %}{{ field.errors[0]|safe }}{% endif %}
         </span>
       {% endif %}
     </label>