diff --git a/helios/templates/email/vote_body.txt b/helios/templates/email/vote_body.txt
index daa9f74cf18c21b2b0915242537678719634a744..301bc62388b004c5a9eecf0af5ff7e8d4fa58a69 100644
--- a/helios/templates/email/vote_body.txt
+++ b/helios/templates/email/vote_body.txt
@@ -9,14 +9,13 @@ Your username: {{voter.user.user_id}}
 Your password: {{voter.user.info.password}}
 {% else %}
 Log in with your {{voter.voter_type}} account.
-{% endifequal %}
-{% if election.use_voter_aliases %}
-Your voter alias: {{voter.alias}}
-
+{% endifequal %}{% if election.use_voter_aliases %}
 In order to protect your privacy, this election is configured
 to never display your username, name, or email address to the public.
 Instead, the ballot tracking center will only display your alias.
 
+Your voter alias is {{voter.alias}}.
+
 IMPORTANTLY, when you are prompted to log in to vote,
 please use your *username*, not your alias.
 {% endif %}
diff --git a/helios/templates/email/vote_subject.txt b/helios/templates/email/vote_subject.txt
index 91486fccdbf019768bacfcbb0997a7c37a9ade01..0d51546ee3f3c7c802682c0f4abeed5523ac03d1 100644
--- a/helios/templates/email/vote_subject.txt
+++ b/helios/templates/email/vote_subject.txt
@@ -1 +1 @@
-vote in {{voter.election.name}}
+{{voter.election.name}} - {{custom_subject|safe}}
diff --git a/helios/templates/voters_email.html b/helios/templates/voters_email.html
index 515ce4f91dd289137becf12cd63abc7ff0305470..53481f9ac6f0abd271fc316b01a53f459fd1cf68 100644
--- a/helios/templates/voters_email.html
+++ b/helios/templates/voters_email.html
@@ -24,6 +24,11 @@ voter_id = '{{voter.voter_id}}';
     the election URL, the login information, and a simple email signature.<br />
     No need to include these in the body of your email below.
   </p>
+
+  <p>
+    The email will also <b><u>automatically</u></b> include the name of the election in the subject,<br />followed by your custom subject.
+  </p>
+  
   <form class="prettyform" action="" method="POST" id="email_form">
     <input type="hidden" name="csrf_token" value="{{csrf_token}}" />
     <table class="pretty">
diff --git a/helios/views.py b/helios/views.py
index c94871db3054096cb6a5bcb10d21f66722a0163b..2e3702699d7a4d419ec674b34ad83c0174da7207 100644
--- a/helios/views.py
+++ b/helios/views.py
@@ -916,8 +916,10 @@ def voters_email(request, election):
       body_template = 'email/vote_body.txt'
       
       extra_vars = {
+        'custom_subject' : email_form.cleaned_data['subject'],
         'custom_message' : email_form.cleaned_data['body'],
-        'election_url' : get_election_url(election)
+        'election_url' : get_election_url(election),
+        'election' : election
         }