diff --git a/app/main/views/notifications.py b/app/main/views/notifications.py
index 438ad5d50..c50a3dac5 100644
--- a/app/main/views/notifications.py
+++ b/app/main/views/notifications.py
@@ -157,7 +157,8 @@ def download_notifications_csv(service_id):
                 status=filter_args.get('status'),
                 page=request.args.get('page', 1),
                 page_size=5000,
-                format_for_csv=True
+                format_for_csv=True,
+                template_type=filter_args.get('message_type')
             )
         ),
         mimetype='text/csv',
diff --git a/app/templates/views/notifications.html b/app/templates/views/notifications.html
index c1eb2985d..432e50731 100644
--- a/app/templates/views/notifications.html
+++ b/app/templates/views/notifications.html
@@ -47,11 +47,11 @@
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
     </form>
   {% endif %}
-    <!--<p class="bottom-gutter">-->
-       <!--<a href="{{ download_link }}" download="download" class="heading-small">Download this report</a>-->
-       <!--&emsp;-->
-       <!--Data available for 7 days-->
-    <!--</p>-->
+    <p class="bottom-gutter">
+       <a href="{{ download_link }}" download="download" class="heading-small">Download this report</a>
+       &emsp;
+       Data available for 7 days
+    </p>
   {{ ajax_block(
     partials,
     url_for('.get_notifications_as_json', service_id=current_service.id, message_type=message_type, status=status, page=page),