diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index d1cf0bb94..85880bf5e 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -2254,6 +2254,7 @@
     border-radius: 100px;
     #session-input-floating-label {
       padding: $session-margin-sm;
+      color: white;
     }
 
     label.session-input-with-label-container.filled {
diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index ee3e54b6e..8739993b4 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -150,7 +150,7 @@
     align-items: center;
     height: 100%;
     width: 100%;
-    z-index: 1;
+    z-index: 5; // to be sure to hide the borders of images in messages
     background-color: inherit;
     display: none;
     padding: 20px;
diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx
index de127a5e5..f67a08b48 100644
--- a/ts/components/session/conversation/SessionConversation.tsx
+++ b/ts/components/session/conversation/SessionConversation.tsx
@@ -217,6 +217,7 @@ export class SessionConversation extends React.Component<Props, State> {
         isDraggingFile: false,
         messageDetailShowProps: undefined,
         quotedMessageProps: undefined,
+        quotedMessageTimestamp: undefined,
       });
     }
   }