diff --git a/conversation.html b/conversation.html
index d15220689..b02b081ef 100644
--- a/conversation.html
+++ b/conversation.html
@@ -52,7 +52,10 @@
             <div class="bubble">
                 <p class="content">{{ message }}</p>
                 <div class='attachments'></div>
-                <p class="timestamp">{{ timestamp }}</p>
+                <div class='meta'>
+                  <span class='timestamp'>{{ timestamp }}</span>
+                  <span class='checkmark hide'>✓</span>
+                </div>
             </div>
         </script>
         <script type='text/x-tmpl-mustache' id='new-group-update-form'>
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 6683fdfc3..72aed0972 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -61,9 +61,8 @@
   font-size: smaller;
 }
 
-.entry .delivered .timestamp::after {
-    margin-left: 4px;
-    content: "✓";
+.entry .delivered .checkmark {
+    display: inline;
 }
 
 
@@ -160,7 +159,7 @@
       color: white;
       background: $blue;
 
-      .timestamp {
+      .meta {
         color: $blue_l;
       }
 
@@ -176,7 +175,6 @@
     }
   }
 
-
   .attachments {
     img, audio, video {
       max-width: 100%;
@@ -198,7 +196,7 @@
     border-radius: (36px / 2);
   }
 
-  .timestamp {
+  .meta {
     margin-top: 3px;
     float: right;
   }
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 8e14c6e0e..bf3857f82 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -1,4 +1,3 @@
-@charset "UTF-8";
 @font-face {
   font-family: 'Roboto-Light';
   src: url("/fonts/Roboto-Light.ttf") format("truetype"); }
@@ -323,9 +322,8 @@ input.new-message {
 .timestamp {
   font-size: smaller; }
 
-.entry .delivered .timestamp::after {
-  margin-left: 4px;
-  content: "✓"; }
+.entry .delivered .checkmark {
+  display: inline; }
 
 .message-list {
   margin: 0;
@@ -401,8 +399,8 @@ input.new-message {
     clear: left;
     color: white;
     background: #2a92e7; }
-    .message-detail .outgoing .bubble .timestamp,
-    .message-list .outgoing .bubble .timestamp {
+    .message-detail .outgoing .bubble .meta,
+    .message-list .outgoing .bubble .meta {
       color: #a2d2f4; }
     .message-detail .outgoing .bubble::before,
     .message-list .outgoing .bubble::before {
@@ -429,8 +427,8 @@ input.new-message {
     width: 36px;
     background: #f3f3f3;
     border-radius: 18px; }
-  .message-detail .timestamp,
-  .message-list .timestamp {
+  .message-detail .meta,
+  .message-list .meta {
     margin-top: 3px;
     float: right; }
   .message-detail .end-session,