diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index 76fde15a0..91ff0a4a0 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -1801,6 +1801,8 @@ void KMComposerWin::setFcc(const QString &idString)
     if (col.isValid()) {
         mComposerBase->setFcc(col);
         mFccFolder->setCollection(col);
+    } else {
+        qCWarning(KMAIL_LOG) << "setFcc: collection invalid " << idString;
     }
 }
 
diff --git a/src/kmcommands.cpp b/src/kmcommands.cpp
index 3a728abd9..ca9f9d10f 100644
--- a/src/kmcommands.cpp
+++ b/src/kmcommands.cpp
@@ -1819,6 +1819,9 @@ KMCommand::Result KMResendMessageCommand::execute()
     KMail::Util::lastEncryptAndSignState(lastEncrypt, lastSign, msg);
     win->setMessage(newMsg, lastSign, lastEncrypt, false, true);
 
+    //Make sure to use current folder as requested by David
+    //We avoid to use an invalid folder when we open an email on two different computer.
+    win->setFcc(QString::number(item.parentCollection().id()));
     win->show();
 
     return OK;