diff --git a/helpdesk/templates/helpdesk/confirm_delete_saved_query.html b/helpdesk/templates/helpdesk/confirm_delete_saved_query.html
index 4b2b5787..6ba9b732 100644
--- a/helpdesk/templates/helpdesk/confirm_delete_saved_query.html
+++ b/helpdesk/templates/helpdesk/confirm_delete_saved_query.html
@@ -2,15 +2,14 @@
 
 {% block helpdesk_title %}{% trans "Delete Saved Query" %}{% endblock %}
 
-{% block helpdesk_body %}{% blocktrans with query.title as query_title  %}
-<h2>Delete Query</h2>
+{% block helpdesk_body %}
+<h2>{% trans "Delete Query" %}</h2>
 
-<p>Are you sure you want to delete this saved filter (<em>{{ query_title }}</em>)? To re-create it, you will need to manually re-filter your ticket listing.</p>
-{% endblocktrans %}
+<p>{% blocktrans with query.title as query_title  %}Are you sure you want to delete this saved filter (<em>{{ query_title }}</em>)? To re-create it, you will need to manually re-filter your ticket listing.{% endblocktrans %}</p>
 
-{% if query.shared %}{% blocktrans %}
-<p>You have shared this query, so other users may be using it. If you delete it, they will have to manually create their own query.</p>
-{% endblocktrans %}{% endif %}
+{% if query.shared %}
+<p>{% blocktrans %}You have shared this query, so other users may be using it. If you delete it, they will have to manually create their own query.{% endblocktrans %}</p>
+{% endif %}
 
 <p><a href='../'>{% trans "No, Don't Delete It" %}</a></p>
 
diff --git a/helpdesk/templates/helpdesk/create_ticket.html b/helpdesk/templates/helpdesk/create_ticket.html
index f3caf81c..fbf63de1 100644
--- a/helpdesk/templates/helpdesk/create_ticket.html
+++ b/helpdesk/templates/helpdesk/create_ticket.html
@@ -6,9 +6,9 @@
 <div class="col-xs-6">
 <div class="panel panel-default">
 
-<div class="panel-body">{% blocktrans %}<h2>Submit a Ticket</h2>
-
-<p>Unless otherwise stated, all fields are required. Please provide as descriptive a title and description as possible.</p>{% endblocktrans %}
+<div class="panel-body">
+<h2>{% trans "Submit a Ticket" %}</h2>
+<p>{% trans "Unless otherwise stated, all fields are required." %} {% trans "Please provide as descriptive a title and description as possible." %}</p>
 
 <form method='post' action='./' enctype='multipart/form-data'>
 <fieldset>
@@ -24,7 +24,7 @@
             {% endif %}
         {% endfor %}
         {% endcomment %}
-    
+
     <div class='buttons form-group'>
         <input type='submit' class="btn btn-primary" value='{% trans "Submit Ticket" %}' />
     </div>
diff --git a/helpdesk/templates/helpdesk/delete_ticket.html b/helpdesk/templates/helpdesk/delete_ticket.html
index c801f714..93209ad5 100644
--- a/helpdesk/templates/helpdesk/delete_ticket.html
+++ b/helpdesk/templates/helpdesk/delete_ticket.html
@@ -2,11 +2,10 @@
 
 {% block helpdesk_title %}{% trans "Delete Ticket" %}{% endblock %}
 
-{% block helpdesk_body %}{% blocktrans with ticket.title as ticket_title %}
-<h2>Delete Ticket</h2>
+{% block helpdesk_body %}
+<h2>{% trans "Delete Ticket" %}</h2>
 
-<p>Are you sure you want to delete this ticket (<em>{{ ticket_title }}</em>)? All traces of the ticket, including followups, attachments, and updates will be irreversably removed.</p>
-{% endblocktrans %}
+<p>{% blocktrans with ticket.title as ticket_title %}Are you sure you want to delete this ticket (<em>{{ ticket_title }}</em>)? All traces of the ticket, including followups, attachments, and updates will be irreversibly removed.{% endblocktrans %}</p>
 
 <p><a href='../'>{% trans "No, Don't Delete It" %}</a></p>
 
diff --git a/helpdesk/templates/helpdesk/edit_ticket.html b/helpdesk/templates/helpdesk/edit_ticket.html
index 0639df22..a3087c99 100644
--- a/helpdesk/templates/helpdesk/edit_ticket.html
+++ b/helpdesk/templates/helpdesk/edit_ticket.html
@@ -6,11 +6,11 @@
 <div class="col-xs-6">
 <div class="panel panel-default">
 
-<div class="panel-body">{% blocktrans %}<h2>Edit a Ticket</h2>
+<div class="panel-body"><h2>{% trans "Edit a Ticket" %}</h2>
 
-<p>Unless otherwise stated, all fields are required. Please provide as descriptive a title and description as possible.</p>
+<p>{% trans "Unless otherwise stated, all fields are required." %} {% trans "Please provide as descriptive a title and description as possible." %}</p>
 
-<p><strong>Note:</strong> Editing a ticket does <em>not</em> send an e-mail to the ticket owner or submitter. No new details should be entered, this form should only be used to fix incorrect details or clean up the submission.</p>{% endblocktrans %}
+<p><strong>{% trans "Note" %}:</strong> {% blocktrans %}Editing a ticket does <em>not</em> send an e-mail to the ticket owner or submitter. No new details should be entered, this form should only be used to fix incorrect details or clean up the submission.{% endblocktrans %}</p>
 
 <form method='post' action='./'>
 <fieldset>
diff --git a/helpdesk/templates/helpdesk/email_ignore_add.html b/helpdesk/templates/helpdesk/email_ignore_add.html
index 68d94adc..f9865398 100644
--- a/helpdesk/templates/helpdesk/email_ignore_add.html
+++ b/helpdesk/templates/helpdesk/email_ignore_add.html
@@ -2,12 +2,12 @@
 
 {% block helpdesk_title %}{% trans "Ignore E-Mail Address" %}{% endblock %}
 
-{% block helpdesk_body %}{% blocktrans %}
-<h2>Ignore E-Mail Address</h2>
+{% block helpdesk_body %}
+<h2>{% trans "Ignore E-Mail Address" %}</h2>
 
-<p>To ignore an e-mail address and prevent any emails from that address creating tickets automatically, enter the e-mail address below.</p>
+<p>{% blocktrans %}To ignore an e-mail address and prevent any emails from that address creating tickets automatically, enter the e-mail address below.{% endblocktrans %}</p>
 
-<p>You can either enter a whole e-mail address such as <em>email@domain.com</em> or a portion of an e-mail address with a wildcard, such as <em>*@domain.com</em> or <em>user@*</em>.</p>{% endblocktrans %}
+<p>{% blocktrans %}You can either enter a whole e-mail address such as <em>email@domain.com</em> or a portion of an e-mail address with a wildcard, such as <em>*@domain.com</em> or <em>user@*</em>.{% endblocktrans %}</p>
 
 <form method='post' action='./'>
 
diff --git a/helpdesk/templates/helpdesk/email_ignore_del.html b/helpdesk/templates/helpdesk/email_ignore_del.html
index 9f3fb0d5..a1ca4b33 100644
--- a/helpdesk/templates/helpdesk/email_ignore_del.html
+++ b/helpdesk/templates/helpdesk/email_ignore_del.html
@@ -2,11 +2,10 @@
 
 {% block helpdesk_title %}{% trans "Delete Ignored E-Mail Address" %}{% endblock %}
 
-{% block helpdesk_body %}{% blocktrans with ignore.email_address as email_address %}
-<h2>Un-Ignore E-Mail Address</h2>
+{% block helpdesk_body %}
+<h2>{% trans "Un-Ignore E-Mail Address" %}</h2>
 
-<p>Are you sure you wish to stop removing this email address (<em>{{ email_address }}</em>) and allow their e-mails to automatically create tickets in your system? You can re-add this e-mail address at any time.</p>
-{% endblocktrans %}
+<p>{% blocktrans with ignore.email_address as email_address %}Are you sure you wish to stop removing this email address (<em>{{ email_address }}</em>) and allow their e-mails to automatically create tickets in your system? You can re-add this e-mail address at any time.{% endblocktrans %}</p>
 
 <p><a href='../../'>{% trans "Keep Ignoring It" %}</a></p>
 
diff --git a/helpdesk/templates/helpdesk/public_homepage.html b/helpdesk/templates/helpdesk/public_homepage.html
index 3cf00b03..d991f0f4 100644
--- a/helpdesk/templates/helpdesk/public_homepage.html
+++ b/helpdesk/templates/helpdesk/public_homepage.html
@@ -25,7 +25,7 @@
 
 <div class="panel-body">
     <h2 name='submit'>{% trans "Submit a Ticket" %}</h2>
-<p>{% trans "All fields are required. Please provide as descriptive a title and description as possible." %}</p>
+<p>{% trans "All fields are required." %} {% trans "Please provide as descriptive a title and description as possible." %}</p>
 
 <form role="form" method='post' action='./#submit' enctype='multipart/form-data'>
 <fieldset>
diff --git a/helpdesk/templates/helpdesk/public_spam.html b/helpdesk/templates/helpdesk/public_spam.html
index ed05434c..0a83fb53 100644
--- a/helpdesk/templates/helpdesk/public_spam.html
+++ b/helpdesk/templates/helpdesk/public_spam.html
@@ -2,12 +2,7 @@
 
 {% block helpdesk_body %}
 <h2>{% trans "Unable To Open Ticket" %}</h2>
-
-{% blocktrans %}<p>Sorry, but there has been an error trying to submit your ticket.</p>
-
-<p>Our system has marked your submission as <strong>spam</strong>, so we are unable to save it. If this is not spam, please press back and re-type your message. Be careful to avoid sounding 'spammy', and if you have heaps of links please try removing them if possible.</p>
-
-<p>We are sorry for any inconvenience, however this check is required to avoid our helpdesk resources being overloaded by spammers.</p>
-{% endblocktrans %}
-
-{% endblock %}
+<p>{% trans "Sorry, but there has been an error trying to submit your ticket." %}</p>
+<p>{% blocktrans %}Our system has marked your submission as <strong>spam</strong>, so we are unable to save it. If this is not spam, please press back and re-type your message. Be careful to avoid sounding 'spammy', and if you have heaps of links please try removing them if possible.{% endblocktrans %}</p>
+<p>{% blocktrans %}We are sorry for any inconvenience, however this check is required to avoid our helpdesk resources being overloaded by spammers.{% endblocktrans %}</p>
+{% endblock helpdesk_body %}
diff --git a/helpdesk/templates/helpdesk/system_settings.html b/helpdesk/templates/helpdesk/system_settings.html
index f2c2c1cb..bead3bdb 100644
--- a/helpdesk/templates/helpdesk/system_settings.html
+++ b/helpdesk/templates/helpdesk/system_settings.html
@@ -2,10 +2,10 @@
 
 {% block helpdesk_title %}{% trans "Change System Settings" %}{% endblock %}
 
-{% block helpdesk_body %}{% blocktrans %}
-<h2>System Settings</h2>
+{% block helpdesk_body %}
+<h2>{% trans "System Settings" %}</h2>
 
-<p>The following items can be maintained by you or other superusers:</p>{% endblocktrans %}
+<p>{% blocktrans %}The following items can be maintained by you or other superusers:{% endblocktrans %}</p>
 
 <ul>
     <li><a href='{% url 'helpdesk_email_ignore' %}'>{% trans "E-Mail Ignore list" %}</a></li>
diff --git a/helpdesk/templates/helpdesk/user_settings.html b/helpdesk/templates/helpdesk/user_settings.html
index 843cae55..50424995 100644
--- a/helpdesk/templates/helpdesk/user_settings.html
+++ b/helpdesk/templates/helpdesk/user_settings.html
@@ -3,11 +3,9 @@
 {% block helpdesk_title %}{% trans "Change User Settings" %}{% endblock %}
 
 {% block helpdesk_body %}
-{% blocktrans %}
-<h2>User Settings</h2>
+<h2>{% trans "User Settings" %}</h2>
 
-<p>Use the following options to change the way your helpdesk system works for you. These settings do not impact any other user.</p>
-{% endblocktrans %}
+<p>{% blocktrans %}Use the following options to change the way your helpdesk system works for you. These settings do not impact any other user.{% endblocktrans %}</p>
 
 <form role="form" method='post' action='./'>
     {% csrf_token %}
@@ -17,4 +15,4 @@
     </div>
 </form>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}