diff --git a/background.html b/background.html
index 44be1a6a0..12889ff48 100644
--- a/background.html
+++ b/background.html
@@ -181,7 +181,9 @@
           {{ #unreadCount }}
             <span class='unread-count'>{{ unreadCount }}</span>
           {{ /unreadCount }}
-          <p class='last-message'> {{ last_message }} </p>
+          {{ #last_message }}
+            <p class='last-message'> {{ last_message }} </p>
+          {{ /last_message }}
       </div>
   </script>
   <script type='text/x-tmpl-mustache' id='phone-number'>
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index 18b48a848..26a4aed32 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -318,9 +318,9 @@ $avatar-size: 44px;
   .contact-details {
     $left-margin: 8px;
 
-    vertical-align: top;
+    vertical-align: middle;
     display: inline-block;
-    margin: 4px 0 0 $left-margin;
+    margin: 0 0 0 $left-margin;
     width: calc(100% - #{$avatar-size} - #{$left-margin});
 
     p {
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss
index 0241a94b0..251235600 100644
--- a/stylesheets/_index.scss
+++ b/stylesheets/_index.scss
@@ -159,7 +159,7 @@ input.search {
   }
 
   .last-message {
-    margin: 6px 0;
+    margin: 6px 0 0;
     font-size: small;
     font-weight: 300;
   }
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 3e6a2aea1..a9d991168 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -261,9 +261,9 @@ img.emoji {
   .contact:last-child::after {
     display: none; }
   .contact .contact-details {
-    vertical-align: top;
+    vertical-align: middle;
     display: inline-block;
-    margin: 4px 0 0 8px;
+    margin: 0 0 0 8px;
     width: calc(100% - 44px - 8px); }
     .contact .contact-details p {
       overflow-x: hidden;
@@ -552,7 +552,7 @@ input.search {
     display: none;
     padding: 0.5em; }
   .index .last-message {
-    margin: 6px 0;
+    margin: 6px 0 0;
     font-size: small;
     font-weight: 300; }
   .index .gutter .timestamp {