diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2cbad2..16a9cb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.1.6
+## 0.1.7
 
 - Improved: Show input indicator in the chat overview as well 
 - Improved: Username change error handling
diff --git a/lib/src/database/daos/messages.dao.dart b/lib/src/database/daos/messages.dao.dart
index 64b91b4..b056ff4 100644
--- a/lib/src/database/daos/messages.dao.dart
+++ b/lib/src/database/daos/messages.dao.dart
@@ -78,7 +78,8 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
                 // messages in groups will only be removed in case all members have received it...
                 // so ensuring that this message is not shown in the messages anymore
                 (t.openedAt.isBiggerThanValue(deletionTime) |
-                    t.openedAt.isNull()),
+                    t.openedAt.isNull() |
+                    t.mediaStored.equals(true)),
           )
           ..orderBy([(t) => OrderingTerm.desc(t.createdAt)])
           ..limit(1))
@@ -98,7 +99,8 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
                 // messages in groups will only be removed in case all members have received it...
                 // so ensuring that this message is not shown in the messages anymore
                 (t.openedAt.isBiggerThanValue(deletionTime) |
-                    t.openedAt.isNull()) &
+                    t.openedAt.isNull() |
+                    t.mediaStored.equals(true)) &
                 (t.isDeletedFromSender.equals(true) |
                     (t.type.equals(MessageType.text.name).not() |
                         t.type.equals(MessageType.media.name).not()) |
diff --git a/pubspec.yaml b/pubspec.yaml
index a175898..3bc4229 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: "twonly, a privacy-friendly way to connect with friends through sec
 
 publish_to: 'none'
 
-version: 0.1.6+106
+version: 0.1.7+107
 
 environment:
   sdk: ^3.11.0