diff --git a/src/persistence/offlinemsgengine.cpp b/src/persistence/offlinemsgengine.cpp
index 48e911cb0..65527946f 100644
--- a/src/persistence/offlinemsgengine.cpp
+++ b/src/persistence/offlinemsgengine.cpp
@@ -82,7 +82,8 @@ void OfflineMsgEngine::deliverOfflineMsgs()
         return;
 
     QMap<int64_t, MsgPtr> msgs = undeliveredMsgs;
-    removeAllReciepts();
+    removeAllReceipts();
+    undeliveredMsgs.clear();
 
     for (auto iter = msgs.begin(); iter != msgs.end(); ++iter)
     {
@@ -105,10 +106,9 @@ void OfflineMsgEngine::deliverOfflineMsgs()
     }
 }
 
-void OfflineMsgEngine::removeAllReciepts()
+void OfflineMsgEngine::removeAllReceipts()
 {
     QMutexLocker ml(&mutex);
 
     receipts.clear();
-    undeliveredMsgs.clear();
 }
diff --git a/src/persistence/offlinemsgengine.h b/src/persistence/offlinemsgengine.h
index 386262a5c..933eb3f51 100644
--- a/src/persistence/offlinemsgengine.h
+++ b/src/persistence/offlinemsgengine.h
@@ -43,7 +43,7 @@ public:
 
 public slots:
     void deliverOfflineMsgs();
-    void removeAllReciepts();
+    void removeAllReceipts();
 
 private:
     struct MsgPtr {
diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
index ac970f844..50f9e8092 100644
--- a/src/widget/form/chatform.cpp
+++ b/src/widget/form/chatform.cpp
@@ -110,7 +110,7 @@ ChatForm::ChatForm(Friend* chatFriend)
     connect(msgEdit, &ChatTextEdit::enterPressed, this, &ChatForm::onSendTriggered);
     connect(msgEdit, &ChatTextEdit::textChanged, this, &ChatForm::onTextEditChanged);
     connect(core, &Core::fileSendFailed, this, &ChatForm::onFileSendFailed);
-    connect(this, &ChatForm::chatAreaCleared, getOfflineMsgEngine(), &OfflineMsgEngine::removeAllReciepts);
+    connect(this, &ChatForm::chatAreaCleared, getOfflineMsgEngine(), &OfflineMsgEngine::removeAllReceipts);
     connect(&typingTimer, &QTimer::timeout, this, [=]{
         Core::getInstance()->sendTyping(f->getFriendID(), false);
         isTyping = false;
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index 0f92883e0..7501ab776 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -1848,7 +1848,7 @@ void Widget::clearAllReceipts()
 {
     QList<Friend*> frnds = FriendList::getAllFriends();
     for (Friend *f : frnds)
-        f->getChatForm()->getOfflineMsgEngine()->removeAllReciepts();
+        f->getChatForm()->getOfflineMsgEngine()->removeAllReceipts();
 }
 
 void Widget::reloadTheme()