diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index c9a0fd5f..4c2d12e2 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -15480,8 +15480,9 @@ MessageId MessagesManager::get_reply_to_message_id(Dialog *d, MessageId message_
   return message_id;
 }
 
-vector<FileId> MessagesManager::get_message_file_ids(const Message *message) const {
-  return get_message_content_file_ids(message->content.get(), td_);
+vector<FileId> MessagesManager::get_message_file_ids(const Message *m) const {
+  CHECK(m != nullptr);
+  return get_message_content_file_ids(m->content.get(), td_);
 }
 
 void MessagesManager::cancel_upload_message_content_files(const MessageContent *content) {
@@ -22919,13 +22920,13 @@ void MessagesManager::delete_message_from_database(Dialog *d, MessageId message_
     }
   }
 
-  auto is_secret = d->dialog_id.get_type() == DialogType::SecretChat;
-  if (m != nullptr && m->ttl > 0) {
+  auto need_delete_message_files = m != nullptr && (d->dialog_id.get_type() == DialogType::User ||
+                                                    d->dialog_id.get_type() == DialogType::SecretChat);
+  if (need_delete_message_files) {
     delete_message_files(m);
   }
 
   if (!G()->parameters().use_message_db) {
-    // TODO message files should be deleted anyway
     return;
   }
 
@@ -22933,7 +22934,7 @@ void MessagesManager::delete_message_from_database(Dialog *d, MessageId message_
 
   logevent.full_message_id_ = {d->dialog_id, message_id};
 
-  if (is_secret && m != nullptr) {
+  if (need_delete_message_files) {
     logevent.file_ids_ = get_message_file_ids(m);
   }
 
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 455cf94f..25f842eb 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -1855,7 +1855,7 @@ class MessagesManager : public Actor {
 
   const ScopeNotificationSettings *get_scope_notification_settings(NotificationSettingsScope scope) const;
 
-  vector<FileId> get_message_file_ids(const Message *message) const;
+  vector<FileId> get_message_file_ids(const Message *m) const;
 
   void cancel_upload_message_content_files(const MessageContent *content);