diff --git a/website/client/components/userMenu/inbox.vue b/website/client/components/userMenu/inbox.vue
index 9b605b4f60..d342ee14ee 100644
--- a/website/client/components/userMenu/inbox.vue
+++ b/website/client/components/userMenu/inbox.vue
@@ -287,7 +287,7 @@ export default {
       const convos = [];
       for (let key in inboxGroup) {
         const convoSorted = sortBy(inboxGroup[key], [(o) => {
-          return o.timestamp;
+          return (new Date(o.timestamp)).getTime();
         }]);
 
         // Fix poor inbox chat models
diff --git a/website/server/models/user/methods.js b/website/server/models/user/methods.js
index ea5575fbf0..c80cec0159 100644
--- a/website/server/models/user/methods.js
+++ b/website/server/models/user/methods.js
@@ -154,7 +154,7 @@ schema.methods.sendMessage = async function sendMessage (userToReceiveMessage, o
       ownerId: sender._id,
     });
     Object.assign(newSenderMessage, messageDefaults(senderMsg, userToReceiveMessage));
-    setUserStyles(newSenderMessage, userToReceiveMessage);
+    setUserStyles(newSenderMessage, sender);
   }
 
   const promises = [newReceiverMessage.save()];