diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index cb0930667..7d2396eca 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -1563,7 +1563,34 @@ void KMComposerWin::setMessage(const KMime::Message::Ptr &newMsg, bool lastSignS
     if (auto hrd = newMsg->headerByType("X-KMail-Identity")) {
         const QString identityStr = hrd->asUnicodeString();
         if (!identityStr.isEmpty()) {
-            mId = identityStr.toUInt();
+            const KIdentityManagement::Identity &ident = KMKernel::self()->identityManager()->identityForUoid(identityStr.toUInt());
+            if (ident.isNull()) {
+                if (auto hrd = newMsg->headerByType("X-KMail-Identity-Name")) {
+                    const QString identityStrName = hrd->asUnicodeString();
+                    const KIdentityManagement::Identity id = KMKernel::self()->identityManager()->modifyIdentityForName(identityStrName);
+                    if (!id.isNull()) {
+                        mId = id.uoid();
+                    } else {
+                        mId = 0;
+                    }
+                } else {
+                    mId = 0;
+                }
+            } else {
+                mId = identityStr.toUInt();
+            }
+        }
+    } else {
+        if (auto hrd = newMsg->headerByType("X-KMail-Identity-Name")) {
+            const QString identityStrName = hrd->asUnicodeString();
+            const KIdentityManagement::Identity id = KMKernel::self()->identityManager()->modifyIdentityForName(identityStrName);
+            if (!id.isNull()) {
+                mId = id.uoid();
+            } else {
+                mId = 0;
+            }
+        } else {
+            mId = 0;
         }
     }
 
@@ -3041,16 +3068,61 @@ void KMComposerWin::slotIdentityChanged(uint uoid, bool initialChange)
             mMsg->setHeader(header);
         }
     }
-    const int transportId = ident.transport().isEmpty() ? -1 : ident.transport().toInt();
-    const Transport *transport = TransportManager::self()->transportById(transportId, true);
-    if (!transport) {
-        mMsg->removeHeader("X-KMail-Transport");
-        mComposerBase->transportComboBox()->setCurrentTransport(TransportManager::self()->defaultTransportId());
+
+
+    if (initialChange) {
+        if (auto hrd = mMsg->headerByType("X-KMail-Transport")) {
+            const QString mailtransportStr = hrd->asUnicodeString();
+            if (!mailtransportStr.isEmpty()) {
+                int transportId = mailtransportStr.toInt();
+                const Transport *transport = TransportManager::self()->transportById(transportId, false); /*don't return default transport */
+                if (transport) {
+                    KMime::Headers::Generic *header = new KMime::Headers::Generic("X-KMail-Transport");
+                    header->fromUnicodeString(QString::number(transport->id()), "utf-8");
+                    mMsg->setHeader(header);
+                    mComposerBase->transportComboBox()->setCurrentTransport(transport->id());
+                } else {
+                    if (auto hrd = mMsg->headerByType("X-KMail-Transport-Name")) {
+                        const QString identityStrName = hrd->asUnicodeString();
+                        const Transport *transport = TransportManager::self()->transportByName(identityStrName, true);
+                        if (transport) {
+                            KMime::Headers::Generic *header = new KMime::Headers::Generic("X-KMail-Transport");
+                            header->fromUnicodeString(QString::number(transport->id()), "utf-8");
+                            mMsg->setHeader(header);
+                            mComposerBase->transportComboBox()->setCurrentTransport(transport->id());
+                        } else {
+                            mComposerBase->transportComboBox()->setCurrentTransport(TransportManager::self()->defaultTransportId());
+                        }
+                    } else {
+                        mComposerBase->transportComboBox()->setCurrentTransport(TransportManager::self()->defaultTransportId());
+                    }
+                }
+            }
+        } else {
+            const int transportId = ident.transport().isEmpty() ? -1 : ident.transport().toInt();
+            const Transport *transport = TransportManager::self()->transportById(transportId, true);
+            if (transport) {
+                KMime::Headers::Generic *header = new KMime::Headers::Generic("X-KMail-Transport");
+                header->fromUnicodeString(QString::number(transport->id()), "utf-8");
+                mMsg->setHeader(header);
+                mComposerBase->transportComboBox()->setCurrentTransport(transport->id());
+            } else {
+                mComposerBase->transportComboBox()->setCurrentTransport(TransportManager::self()->defaultTransportId());
+            }
+
+        }
     } else {
-        KMime::Headers::Generic *header = new KMime::Headers::Generic("X-KMail-Transport");
-        header->fromUnicodeString(QString::number(transport->id()), "utf-8");
-        mMsg->setHeader(header);
-        mComposerBase->transportComboBox()->setCurrentTransport(transport->id());
+        const int transportId = ident.transport().isEmpty() ? -1 : ident.transport().toInt();
+        const Transport *transport = TransportManager::self()->transportById(transportId, true);
+        if (!transport) {
+            mMsg->removeHeader("X-KMail-Transport");
+            mComposerBase->transportComboBox()->setCurrentTransport(TransportManager::self()->defaultTransportId());
+        } else {
+            KMime::Headers::Generic *header = new KMime::Headers::Generic("X-KMail-Transport");
+            header->fromUnicodeString(QString::number(transport->id()), "utf-8");
+            mMsg->setHeader(header);
+            mComposerBase->transportComboBox()->setCurrentTransport(transport->id());
+        }
     }
 
     const bool fccIsDisabled = ident.disabledFcc();
diff --git a/src/job/fillcomposerjob.cpp b/src/job/fillcomposerjob.cpp
index f9b845340..27797cb04 100644
--- a/src/job/fillcomposerjob.cpp
+++ b/src/job/fillcomposerjob.cpp
@@ -40,7 +40,7 @@ FillComposerJob::~FillComposerJob()
 void FillComposerJob::start()
 {
     mMsg = KMime::Message::Ptr(new KMime::Message);
-    MessageHelper::initHeader(mMsg, KMKernel::self()->identityManager());
+    MessageHelper::initHeader(mMsg, KMKernel::self()->identityManager(), mSettings.mIdentity);
     mMsg->contentType()->setCharset("utf-8");
     if (!mSettings.mCc.isEmpty()) {
         mMsg->cc()->fromUnicodeString(mSettings.mCc, "utf-8");