diff --git a/opentech/apply/activity/messaging.py b/opentech/apply/activity/messaging.py
index 02d631eb8b85318cd8a35fa1cf8f413ff16232a3..c41ca6c51c54c4d04e95e8ae46bf541b42e6d304 100644
--- a/opentech/apply/activity/messaging.py
+++ b/opentech/apply/activity/messaging.py
@@ -153,8 +153,8 @@ class EmailAdapter(AdapterBase):
     messages = {
         MESSAGES.NEW_SUBMISSION: 'funds/email/confirmation.html',
         MESSAGES.COMMENT: 'notify_comment',
-        MESSAGES.TRANSITION: 'funds/email/transition.html',
         MESSAGES.DETERMINATION_OUTCOME: 'funds/email/determination.html',
+        MESSAGES.TRANSITION: 'messages/email/transition.html',
     }
 
     def notify_comment(self, **kwargs):
diff --git a/opentech/apply/activity/templates/messages/email/base.html b/opentech/apply/activity/templates/messages/email/base.html
index eb070ca5cc9cde2f149c68db2232422fe493a256..99ea0b562ffaf80f9b9cbc5b16947e935e9f4f4a 100644
--- a/opentech/apply/activity/templates/messages/email/base.html
+++ b/opentech/apply/activity/templates/messages/email/base.html
@@ -4,7 +4,7 @@ Dear {{ submission.user.get_full_name|default:"applicant" }},
 
 You can access your application here: {{ request.scheme }}://{{ request.get_host }}{{ submission.get_absolute_url }}
 
-If you have any questions, please email us at info@opentechfund.org.
+If you have any questions, please leave a message on your application or email us at info@opentechfund.org.
 
 Kind Regards,
 The OTF Team
@@ -13,5 +13,4 @@ The OTF Team
 Open Technology Fund
 https://www.opentech.fund/
 
-{% block post_signature_content %}
-{% endblock %}
+{% block post_signature_content %}{% endblock %}
diff --git a/opentech/apply/activity/templates/messages/email/transition.html b/opentech/apply/activity/templates/messages/email/transition.html
index 7bee07e66e48c250b84a192b8ce3e7ef9e75a5bb..b11b6919c4e7c52942bdf282aec628d930b31cda 100644
--- a/opentech/apply/activity/templates/messages/email/transition.html
+++ b/opentech/apply/activity/templates/messages/email/transition.html
@@ -1,5 +1,5 @@
 {% extends "messages/email/base.html" %}
 
 {% block content %}
-Your application has been progressed from {old_phase.display_name} to {submission.phase}.
+Your application has been progressed from {{ old_phase.display_name }} to {{ submission.phase }}.
 {% endblock %}
diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index 4a2c4ed1fae5973d84dd04999ed8ee0c373bdac1..fa4b9c36f29f1b3e87a7407c407050c36f1135b5 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -38,7 +38,7 @@ class SubmissionListView(AllActivityContextMixin, SingleTableMixin, FilterView):
     filterset_class = SubmissionFilter
 
     def get_queryset(self):
-        return self.filterset_class._meta.model.objects.active().current()
+        return self.filterset_class._meta.model.objects.current()
 
     def get_context_data(self, **kwargs):
         active_filters = self.filterset.data