1 files changed, 4 insertions, 6 deletions

diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index 4764b77..281b88e 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -491,3 +491,3 @@ void SMTPwrapper::storeMail(const char*mail, size_t length, const QString&box)
     QString localfolders = AbstractMail::defaultLocalfolder();
-    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
+    AbstractMail*wrap = AbstractMail::getWrapper(localfolders);
     wrap->storeMessage(mail,length,box);
@@ -518,7 +518,5 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
     }
-    QString tmp = data;
-    tmp.replace(QRegExp("\r+",true,false),"");
     msg = 0;
     if (later) {
-        storeMail((char*)tmp.data(),tmp.length(),"Outgoing");
+        storeMail(data,size,"Outgoing");
         if (data) free( data );
@@ -638,3 +636,3 @@ void SMTPwrapper::sendMail(const Mail&mail,SMTPaccount*aSmtp,bool later )
 
-int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
+int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,SMTPaccount*smtp,RecMail*which)
 {
@@ -687,3 +685,3 @@ bool SMTPwrapper::flushOutbox(SMTPaccount*smtp)
     QString localfolders = AbstractMail::defaultLocalfolder();
-    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
+    AbstractMail*wrap = AbstractMail::getWrapper(localfolders);
     if (!wrap) {