summaryrefslogtreecommitdiffstats
path: root/kmail/kmsender.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmsender.cpp')
-rw-r--r--kmail/kmsender.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index a79da268f..7f7730daf 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -317,6 +317,7 @@ void KMSender::doSendMsg()
mCurrentMsg->setStatus(KMMsgStatusSent);
mCurrentMsg->setStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
mCurrentMsg->updateAttachmentState();
+ mCurrentMsg->updateInvitationState();
const KPIM::Identity & id = kmkernel->identityManager()
->identityForUoidOrDefault( mCurrentMsg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt() );
@@ -421,10 +422,10 @@ void KMSender::doSendMsg()
// empty
const KPIM::Identity & id = kmkernel->identityManager()
->identityForUoidOrDefault( mCurrentMsg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt() );
- if ( !id.emailAddr().isEmpty() ) {
+ if ( !id.primaryEmailAddress().isEmpty() ) {
mCurrentMsg->setFrom( id.fullEmailAddr() );
}
- else if ( !kmkernel->identityManager()->defaultIdentity().emailAddr().isEmpty() ) {
+ else if ( !kmkernel->identityManager()->defaultIdentity().primaryEmailAddress().isEmpty() ) {
mCurrentMsg->setFrom( kmkernel->identityManager()->defaultIdentity().fullEmailAddr() );
}
else {