Fixes for NB#261810 Random crashes observed upon tapping send in reply/forward editor

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index e1f52d1b..638e30d6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 Latest Changes
 ---------------
 
+201123
+  * Fixes: NB#261810 Random crashes observed upon tapping send in reply/forward editor
+
 201122
   * Fixes: NB#259331 Does not show new emails immediately
   * Fixes: NB#249858 Random crash observed with assert 
diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
index e5497c8a..4ffc1e6f 100644
--- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
+++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
@@ -257,7 +257,7 @@ QMailStore::ErrorCode QmfStorageManager::add(QMailMessage *message, QMailContent
 QMailStore::ErrorCode QmfStorageManager::addOrRename(QMailMessage *message, const QString &existingIdentifier, QMailContentManager::DurabilityRequirement durability)
 {
     // Use the supplied identifier as a filename
-    QString filePath = generateUniqueFileName(message->parentAccountId(), message->contentIdentifier());
+    QString filePath = generateUniqueFileName(message->parentAccountId());
 
     message->setContentIdentifier(filePath);