1 files changed, 3 insertions, 0 deletions

diff --git a/framework/src/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp
index 43701d36..c55df1e7 100644
--- a/framework/src/domain/composercontroller.cpp
+++ b/framework/src/domain/composercontroller.cpp
@@ -389,14 +389,17 @@ KMime::Message::Ptr ComposerController::assembleMessage()
     if (!mail) {
         mail = KMime::Message::Ptr::create();
     }
+    mail->to(true)->clear();
     applyAddresses(mToModel->stringList(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
         mail->to(true)->addAddress(addrSpec, displayName);
         recordForAutocompletion(addrSpec, displayName);
     });
+    mail->cc(true)->clear();
     applyAddresses(mCcModel->stringList(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
         mail->cc(true)->addAddress(addrSpec, displayName);
         recordForAutocompletion(addrSpec, displayName);
     });
+    mail->bcc(true)->clear();
     applyAddresses(mBccModel->stringList(), [&](const QByteArray &addrSpec, const QByteArray &displayName) {
         mail->bcc(true)->addAddress(addrSpec, displayName);
         recordForAutocompletion(addrSpec, displayName);