diff --git a/js/background.js b/js/background.js
index 37b4f4aae..618e23905 100644
--- a/js/background.js
+++ b/js/background.js
@@ -992,13 +992,6 @@
       }
     });
 
-    Whisper.events.on('deleteConversation', async conversation => {
-      await conversation.destroyMessages();
-      await window.Signal.Data.removeConversation(conversation.id, {
-        Conversation: Whisper.Conversation,
-      });
-    });
-
     Whisper.Notifications.on('click', (id, messageId) => {
       window.showWindow();
       if (id) {
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index c2484217f..612c791a1 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -1850,19 +1850,7 @@
     to bottom,
     rgba(0, 0, 0, 0),
     rgba(0, 0, 0, 0) 9%,
-    rgba(0, 0, 0, 0.02) 17%,
-    rgba(0, 0, 0, 0.05) 24%,
-    rgba(0, 0, 0, 0.08) 31%,
-    rgba(0, 0, 0, 0.12) 37%,
-    rgba(0, 0, 0, 0.16) 44%,
-    rgba(0, 0, 0, 0.2) 50%,
-    rgba(0, 0, 0, 0.24) 56%,
-    rgba(0, 0, 0, 0.28) 63%,
-    rgba(0, 0, 0, 0.32) 69%,
-    rgba(0, 0, 0, 0.35) 76%,
-    rgba(0, 0, 0, 0.38) 83%,
-    rgba(0, 0, 0, 0.4) 91%,
-    rgba(0, 0, 0, 0.4)
+    rgba(0, 0, 0, 0.6)
   );
   position: absolute;
   bottom: 0;
diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss
index 7093a3296..ce0d4dc24 100644
--- a/stylesheets/_session_theme.scss
+++ b/stylesheets/_session_theme.scss
@@ -50,6 +50,16 @@
         @include session-color-subtle(themed('receivedMessageText'));
       }
     }
+
+    // when no caption, we have a black shadow behind the metadata field. So fallback to white
+    .module-message__metadata--with-image-no-caption {
+      .module-message__metadata,
+      .module-message__metadata__date,
+      .module-message__metadata__badge,
+      .module-message__metadata__badge--separator {
+        color: white;
+      }
+    }
   }
 
   &__container--outgoing {