diff --git a/src/contexts/MessagesContext.tsx b/src/contexts/MessagesContext.tsx
index acdad49..e8e4bfc 100644
--- a/src/contexts/MessagesContext.tsx
+++ b/src/contexts/MessagesContext.tsx
@@ -785,7 +785,8 @@ export const MessagesProvider = (props: { children: ContextChildren }) => {
       account?.hasPublicKey() &&
       store.selectedSender &&
       store.messageCountPerSender[store.selectedSender] &&
-      store.messageCountPerSender[store.selectedSender].cnt > 0
+      store.messageCountPerSender[store.selectedSender].cnt > 0,
+      store.isConversationLoaded
     ) {
 
       updateStore('encryptedMessages', () => []);
diff --git a/src/pages/Messages.module.scss b/src/pages/Messages.module.scss
index 2b317f0..7c887bd 100644
--- a/src/pages/Messages.module.scss
+++ b/src/pages/Messages.module.scss
@@ -170,8 +170,10 @@
       margin-bottom: 0px;
       align-items: center;
 
-      &:hover, &.selected {
+      &:hover, &.selected, &.focus {
         background-color: var(--background-input);
+        box-shadow: none;
+        outline: none;
       }
 
       .senderInfo {
@@ -352,6 +354,10 @@
         line-height: 20px;
         font-weight: 700;
         background: var(--accent);
+
+        .iconSend {
+          background-color: var(--text-primary-button);
+        }
       }
     }
   }