diff --git a/src/js/components/PrivateMessage.tsx b/src/js/components/PrivateMessage.tsx
index 73476d23..09f6d7a2 100644
--- a/src/js/components/PrivateMessage.tsx
+++ b/src/js/components/PrivateMessage.tsx
@@ -91,7 +91,7 @@ const PrivateMessage = (props) => {
 
   return (
     <div
-      className={`p-2 w-full md:w-2/3 rounded-xl m-2 ${whose} ${seen} ${delivered} flex flex-col items-start`}
+      className={`p-2 w-full md:w-2/3 rounded-xl mb-1 ${whose} ${seen} ${delivered} flex flex-col items-start`}
     >
       <div className="w-full">
         <div className="mb-2">
diff --git a/src/js/views/chat/ChatMessages.tsx b/src/js/views/chat/ChatMessages.tsx
index 3ab36a58..2c3e0896 100644
--- a/src/js/views/chat/ChatMessages.tsx
+++ b/src/js/views/chat/ChatMessages.tsx
@@ -119,7 +119,7 @@ function ChatMessages({ id }) {
             isDifferentDay = true;
             const separatorText = Helpers.getDaySeparatorText(date, dateStr, now, nowStr);
             msgListContent.push(
-              <div className="px-2 py-1 inline-block day-separator bg-black opacity-50 text-white rounded-full">
+              <div className="px-2 mt-3 mb-4 py-1 inline-block day-separator bg-black opacity-50 text-white rounded-full">
                 {t(separatorText.toLowerCase())}
               </div>,
             );
@@ -127,12 +127,9 @@ function ChatMessages({ id }) {
           previousDateStr = dateStr;
         }
 
-        let showName = false;
-        if (
-          msg.pubkey !== myPub &&
-          (isDifferentDay || (previousFrom && msg.pubkey !== previousFrom))
-        ) {
-          msgListContent.push(<div className="from-separator" />);
+        let showName = isDifferentDay;
+        if (!isDifferentDay && previousFrom && msg.pubkey !== previousFrom) {
+          msgListContent.push(<div className="m-2" />);
           showName = true;
         }
         previousFrom = msg.pubkey;