diff --git a/background.html b/background.html
index 2bedd737..89372a47 100644
--- a/background.html
+++ b/background.html
@@ -239,9 +239,11 @@
       {{ ^their_key }}
         <div class='placeholder'>{{ their_key_unknown }}</div>
       {{ /their_key }}
-      <div class='key'>
-        {{ #their_key }} <span>{{ . }}</span> {{ /their_key }}
-      </div>
+      {{ #has_their_key }}
+        <div class='key'>
+          {{ #their_key }} <span>{{ . }}</span> {{ /their_key }}
+        </div>
+      {{ /has_their_key }}
       <p> {{yourIdentity}} </p>
       <div class='key'>
         {{ #your_key  }} <span>{{ . }}</span> {{ /your_key  }}
diff --git a/js/views/key_verification_view.js b/js/views/key_verification_view.js
index 398e3471..2b25c085 100644
--- a/js/views/key_verification_view.js
+++ b/js/views/key_verification_view.js
@@ -31,7 +31,8 @@
                 theirIdentity: i18n('theirIdentity'),
                 their_key_unknown: i18n('theirIdentityUnknown'),
                 your_key: this.splitKey(this.model.your_key),
-                their_key: this.splitKey(this.model.their_key)
+                their_key: this.splitKey(this.model.their_key),
+                has_their_key: this.model.their_key !== undefined
             };
         }
     });
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 2775888c..7bbaa2c1 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -47,6 +47,7 @@
 
 .key-verification {
   background: white;
+  padding: 20px 10px;
 
   p {
     padding: 1em;
@@ -57,6 +58,11 @@
   }
   .key {
     font-family: monospace;
+    padding: 10px;
+    margin: 10px;
+    background: $grey_l;
+    border: solid 1px $grey_l2;
+    border-radius: 5px;
   }
   .placeholder {
     font-weight: bold;
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index fb5752b3..16aba259 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -653,14 +653,20 @@ input.search {
         overflow-y: auto; }
 
 .key-verification {
-  background: white; }
+  background: white;
+  padding: 20px 10px; }
   .key-verification p {
     padding: 1em; }
   .key-verification .key, .key-verification .placeholder {
     padding: 0 1em;
     -webkit-user-select: text; }
   .key-verification .key {
-    font-family: monospace; }
+    font-family: monospace;
+    padding: 10px;
+    margin: 10px;
+    background: #f3f3f3;
+    border: solid 1px #d9d9d9;
+    border-radius: 5px; }
   .key-verification .placeholder {
     font-weight: bold; }