diff --git a/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss b/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss
index 71662c80c..ec75473d3 100644
--- a/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss
+++ b/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss
@@ -40,7 +40,15 @@
 
 .js-stick-at-bottom-when-scrolling {
 
+  $vertical-padding: $gutter * 2 / 3;
+
   transition: bottom 0.1s ease-out, box-shadow 1s ease-in-out;
+  padding: $vertical-padding 0 $vertical-padding $gutter-half;
+  margin-top: -$vertical-padding;
+
+  .page-footer {
+    margin-bottom: 0;
+  }
 
 }
 
diff --git a/app/main/views/send.py b/app/main/views/send.py
index cfab9b585..188a46fa7 100644
--- a/app/main/views/send.py
+++ b/app/main/views/send.py
@@ -543,6 +543,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
         db_template,
         current_service,
         show_recipient=True,
+        expand_emails=True,
         letter_preview_url=url_for(
             '.check_messages_preview',
             service_id=service_id,
@@ -853,6 +854,7 @@ def _check_notification(service_id, template_id, exception=None):
         db_template,
         current_service,
         show_recipient=True,
+        expand_emails=True,
         email_reply_to=email_reply_to,
         sms_sender=sms_sender,
         letter_preview_url=url_for(
diff --git a/app/templates/views/notifications/check.html b/app/templates/views/notifications/check.html
index 15beea30f..8ab9434cc 100644
--- a/app/templates/views/notifications/check.html
+++ b/app/templates/views/notifications/check.html
@@ -52,7 +52,7 @@
 
   {{ template|string }}
 
-  <div class="bottom-gutter-3-2">
+  <div class="js-stick-at-bottom-when-scrolling">
     <form method="post" enctype="multipart/form-data" action="{{url_for(
         'main.send_notification',
         service_id=current_service.id,