diff --git a/background.html b/background.html
index c4ddb734d..e1df4f9a6 100644
--- a/background.html
+++ b/background.html
@@ -329,10 +329,6 @@
     {{/isError}}
   </script>
 
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/clearnet
   <script type='text/javascript' src='js/components.js'></script>
   <script type='text/javascript' src='js/reliable_trigger.js'></script>
   <script type='text/javascript' src='js/database.js'></script>
diff --git a/ts/components/conversation/Quote.tsx b/ts/components/conversation/Quote.tsx
index a9bf68fae..cf9a27c9e 100644
--- a/ts/components/conversation/Quote.tsx
+++ b/ts/components/conversation/Quote.tsx
@@ -316,7 +316,7 @@ export class Quote extends React.Component<Props, State> {
           i18n('you')
         ) : (
           <ContactName
-            phoneNumber={authorPhoneNumber}
+            phoneNumber={window.shortenPubkey(authorPhoneNumber)}
             name={authorName}
             profileName={authorProfileName}
             i18n={i18n}