reduced to the max...

- from address isn't setup any longer within the smtp account (it makes realy no
  sense, a smtp account describes the connection to a smtp server, not the
  identity of the sender)
- from address is taken from the personal info of the addressbook (thats why this
  info exists). Of course the user can change it when sending an email.
- user can select a from with a selection of the mails given in their personal
  infos.
- in addresspicker: use "<Firstname> <Lastname>" instead of "Filename"
- settings ui: switched of the part within the smtp accounts describing the
  identitiy of user
ToDo: a dialog setting up a default signature

13 files changed, 322 insertions, 542 deletions

diff --git a/noncore/net/mail/addresspicker.cpp b/noncore/net/mail/addresspicker.cpp
index 581de62..7857870 100644
--- a/noncore/net/mail/addresspicker.cpp
+++ b/noncore/net/mail/addresspicker.cpp
@@ -1,99 +1,99 @@
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qlistbox.h>
 #include <qfile.h>
 
 #include <qpe/resource.h>
 #include <opie/ocontactaccess.h>
 #include <opie/ocontact.h>
 
 
 #include <stdlib.h>
 
 #include "composemail.h"
 
 AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFlags flags ) 
     : AddressPickerUI( parent, name, modal, flags )
 {
     okButton->setIconSet( Resource::loadPixmap( "enter" ) );
     cancelButton->setIconSet( Resource::loadPixmap( "editdelete" ) );
 
     connect(okButton, SIGNAL(clicked()), SLOT(accept()));
     connect(cancelButton, SIGNAL(clicked()), SLOT(close()));
     OContactAccess::List::Iterator it;
 
     QString lineEmail, lineName, contactLine;
     /* what name has to set here???? */
     OContactAccess m_contactdb("addressbook");
     QStringList mails;
     QString pre,suf;
     OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 );
     for ( it = m_list.begin(); it != m_list.end(); ++it ) {
         if ((*it).defaultEmail().length()!=0) {
             mails = (*it).emailList();
             if ((*it).fileAs().length()>0) {
-                pre = "\""+(*it).fileAs()+"\" <";
+                pre = "\""+(*it).firstName()+" "+(*it).lastName()+"\" <";
                 suf = ">";
             } else {
                 pre = "";
                 suf = "";
             }
             QStringList::ConstIterator sit = mails.begin();
             for (;sit!=mails.end();++sit) {
                 contactLine=pre+(*sit)+suf;
                 addressList->insertItem(contactLine);
             }            
         }
     }
 	if ( addressList->count() <= 0 ) {
 #if 0
     // makes this realy sense??
 		addressList->insertItem( 
             tr( "There are no entries in the addressbook." ) );
 #endif
 		addressList->setEnabled( false );
 		okButton->setEnabled( false );
 	} else {
 //        addressList->sort();
     }
 }
 
 void AddressPicker::accept()
 {
 	QListBoxItem *item = addressList->firstItem();
 	QString names;
 
 	while ( item ) {
 		if ( item->selected() )
 			names += item->text() + ", ";
 		item = item->next();
 	}
 	names.replace( names.length() - 2, 2, "" );
 
 	if ( names.isEmpty() ) {
 		QMessageBox::information(this, tr("Error"), tr("<p>You have to select"
 			" at least one address entry.</p>"), tr("Ok"));
 		return;
 	}
 
 	selectedNames = names;
 	QDialog::accept();
 }
 
 QString AddressPicker::getNames()
 {
 	QString names = 0;
 	
 	AddressPicker picker(0, 0, true);
 	picker.showMaximized();
 	picker.show();
 
 	int ret = picker.exec();
 	if ( QDialog::Accepted == ret ) {
 		return picker.selectedNames;
 	}
 
 	return 0;
 }
 
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index 73d1a43..13c7900 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -1,215 +1,239 @@
 #include <qt.h>
 
 #include <opie/ofiledialog.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
+#include <qpe/global.h>
+#include <qpe/contact.h>
 
 #include "composemail.h"
 #include "smtpwrapper.h"
 
 ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags )
     : ComposeMailUI( parent, name, modal, flags )
 {
     settings = s;
 
+    QString vfilename = Global::applicationFileName("addressbook",
+                "businesscard.vcf");
+    Contact c;
+    if (QFile::exists(vfilename)) {
+        c = Contact::readVCard( vfilename )[0];
+    }
+
+    QStringList mails = c.emailList();
+    QString defmail = c.defaultEmail();
+    
+    if (defmail.length()!=0) {
+        fromBox->insertItem(defmail);
+    }
+    QStringList::ConstIterator sit = mails.begin();
+    for (;sit!=mails.end();++sit) {
+        if ( (*sit)==defmail)
+            continue;
+        fromBox->insertItem((*sit));
+    }
+    senderNameEdit->setText(c.firstName()+" "+c.lastName());
     Config cfg( "mail" );
     cfg.setGroup( "Compose" );
     checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) );
 
     attList->addColumn( tr( "Name" ) );
     attList->addColumn( tr( "Size" ) );
 
     QList<Account> accounts = settings->getAccounts();
+    
     Account *it;
     for ( it = accounts.first(); it; it = accounts.next() ) {
         if ( it->getType().compare( "SMTP" ) == 0 ) {
            SMTPaccount *smtp = static_cast<SMTPaccount *>(it);
-           fromBox->insertItem( smtp->getMail() );
+           smtpAccountBox->insertItem( smtp->getAccountName() );
            smtpAccounts.append( smtp );
         }
     }
 
     if ( smtpAccounts.count() > 0 ) {
-        fillValues( fromBox->currentItem() );
+        fillValues( smtpAccountBox->currentItem() );
     } else {
         QMessageBox::information( this, tr( "Problem" ),
                                   tr( "<p>Please create an SMTP account first.</p>" ),
                                   tr( "Ok" ) );
         return;
     }
 
-    connect( fromBox, SIGNAL( activated( int ) ), SLOT( fillValues( int ) ) );
+    connect( smtpAccountBox, SIGNAL( activated( int ) ), SLOT( fillValues( int ) ) );
     connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) );
     connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) );
     connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) );
     connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) );
     connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) );
     connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) );
 }
 
 void ComposeMail::pickAddress( QLineEdit *line )
 {
     QString names = AddressPicker::getNames();
     if ( line->text().isEmpty() ) {
         line->setText( names );
     } else if ( !names.isEmpty() ) {
         line->setText( line->text() + ", " + names );
     }
 }
 
 
 void ComposeMail::setTo( const QString & to )
 {
 /*  QString toline;
   QStringList toEntry = to;
   for ( QStringList::Iterator it = toEntry.begin(); it != toEntry.end(); ++it ) {
      toline += (*it);
   }
   toLine->setText( toline );
 */
 toLine->setText( to );
 }
 
 void ComposeMail::setSubject( const QString & subject )
 {
  subjectLine->setText( subject );
 }
 
 void ComposeMail::setInReplyTo( const QString & messageId )
 {
 
 }
 
 void ComposeMail::setMessage( const QString & text )
 {
   message->setText( text );
 }
 
 
 void ComposeMail::pickAddressTo()
 {
     pickAddress( toLine );
 }
 
 void ComposeMail::pickAddressCC()
 {
     pickAddress( ccLine );
 }
 
 void ComposeMail::pickAddressBCC()
 {
     pickAddress( bccLine );
 }
 
 void ComposeMail::pickAddressReply()
 {
     pickAddress( replyLine );
 }
 
 void ComposeMail::fillValues( int current )
 {
+#if 0
     SMTPaccount *smtp = smtpAccounts.at( current );
-
     ccLine->clear();
     if ( smtp->getUseCC() ) {
         ccLine->setText( smtp->getCC() );
     }
     bccLine->clear();
     if ( smtp->getUseBCC() ) {
         bccLine->setText( smtp->getBCC() );
     }
     replyLine->clear();
     if ( smtp->getUseReply() ) {
         replyLine->setText( smtp->getReply() );
     }
-
     sigMultiLine->setText( smtp->getSignature() );
+#endif
 }
 
 void ComposeMail::slotAdjustColumns()
 {
     int currPage = tabWidget->currentPageIndex();
 
     tabWidget->showPage( attachTab );
     attList->setColumnWidth( 0, attList->visibleWidth() - 80 );
     attList->setColumnWidth( 1, 80 );
 
     tabWidget->setCurrentPage( currPage );
 }
 
 void ComposeMail::addAttachment()
 {
     DocLnk lnk = OFileDialog::getOpenFileName( 1, "/" );
     if ( !lnk.name().isEmpty() ) {
         Attachment *att = new Attachment( lnk );
         (void) new AttachViewItem( attList, att );
     }
 }
 
 void ComposeMail::removeAttachment()
 {
     if ( !attList->currentItem() ) {
         QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select a File.</p>" ),
                                   tr( "Ok" ) );
     } else {
         attList->takeItem( attList->currentItem() );
     }
 }
 
 void ComposeMail::accept()
 {
     if ( checkBoxLater->isChecked() ) {
         qDebug(  "Send later" );
     }
 
-
+#if 0
     qDebug( "Sending Mail with " +
-            smtpAccounts.at( fromBox->currentItem() )->getAccountName() );
+            smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() );
+#endif
     Mail *mail = new Mail();
-    SMTPaccount *smtp = smtpAccounts.at( fromBox->currentItem() );
     
-    mail->setMail( smtp->getMail() );
-    mail->setName( smtp->getName() );
+    SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() );
+    mail->setMail(fromBox->currentText());
 
     if ( !toLine->text().isEmpty() ) {
         mail->setTo( toLine->text() );
     } else {
         qDebug( "No Reciever spezified -> returning" );
         return;
     }
-
+    mail->setName(senderNameEdit->text());
     mail->setCC( ccLine->text() );
     mail->setBCC( bccLine->text() );
     mail->setReply( replyLine->text() );
     mail->setSubject( subjectLine->text() );
     QString txt = message->text();
     if ( !sigMultiLine->text().isEmpty() ) {
         txt.append( "\n--\n" );
         txt.append( sigMultiLine->text() );
     }
+    qDebug(txt);
     mail->setMessage( txt );
     AttachViewItem *it = (AttachViewItem *) attList->firstChild();
     while ( it != NULL ) {
         mail->addAttachment( it->getAttachment() );
         it = (AttachViewItem *) it->nextSibling();
     }
 
     SMTPwrapper wrapper( settings );
-    wrapper.sendMail( *mail,checkBoxLater->isChecked() );
+    wrapper.sendMail( *mail,smtp,checkBoxLater->isChecked() );
 
     QDialog::accept();
 }
 
 AttachViewItem::AttachViewItem( QListView *parent, Attachment *att )
     : QListViewItem( parent )
 {
     attachment = att;
     qDebug( att->getMimeType() );
     setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ?
                   Resource::loadPixmap( "UnknownDocument-14" ) :
                   attachment->getDocLnk().pixmap() );
     setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() );
     setText( 1, QString::number( att->getSize() ) );
 }
 
diff --git a/noncore/net/mail/composemailui.ui b/noncore/net/mail/composemailui.ui
index 4d225e4..aebdf67 100644
--- a/noncore/net/mail/composemailui.ui
+++ b/noncore/net/mail/composemailui.ui
@@ -1,334 +1,476 @@
 <!DOCTYPE UI><UI>
 <class>ComposeMailUI</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>ComposeMailUI</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>260</width>
+            <width>252</width>
             <height>360</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Compose Message</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
-            <number>3</number>
+            <number>1</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>3</number>
+            <number>1</number>
         </property>
         <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout4</cstring>
+            </property>
+            <property>
+                <name>layoutSpacing</name>
+            </property>
+            <grid>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>3</number>
+                </property>
+                <widget row="0"  column="0" >
             <class>QCheckBox</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>checkBoxLater</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>send later</string>
             </property>
         </widget>
+                <widget row="0"  column="1" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>accountLabel</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>use:</string>
+                    </property>
+                </widget>
+                <widget row="0"  column="2" >
+                    <class>QComboBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>smtpAccountBox</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>3</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                </widget>
+            </grid>
+        </widget>
         <widget>
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>tabWidget</cstring>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>mailTab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Mail</string>
                 </attribute>
+                <vbox>
+                    <property stdset="1">
+                        <name>margin</name>
+                        <number>1</number>
+                    </property>
+                    <property stdset="1">
+                        <name>spacing</name>
+                        <number>1</number>
+                    </property>
+                    <widget>
+                        <class>QLayoutWidget</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>Layout10</cstring>
+                        </property>
+                        <property>
+                            <name>layoutSpacing</name>
+                        </property>
+                        <grid>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>0</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>1</number>
+                            </property>
+                            <widget row="0"  column="1" >
+                                <class>QLayoutWidget</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>Layout9</cstring>
+                                </property>
+                                <property>
+                                    <name>layoutSpacing</name>
+                                </property>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>-1</number>
+                                        <number>0</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
-                        <number>-1</number>
+                                        <number>3</number>
                     </property>
+                                    <widget row="0"  column="1" >
+                                        <class>QComboBox</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>fromBox</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>sizePolicy</name>
+                                            <sizepolicy>
+                                                <hsizetype>3</hsizetype>
+                                                <vsizetype>0</vsizetype>
+                                            </sizepolicy>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>editable</name>
+                                            <bool>true</bool>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>duplicatesEnabled</name>
+                                            <bool>false</bool>
+                                        </property>
+                                    </widget>
+                                    <widget row="0"  column="0" >
+                                        <class>QLineEdit</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>senderNameEdit</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>sizePolicy</name>
+                                            <sizepolicy>
+                                                <hsizetype>0</hsizetype>
+                                                <vsizetype>0</vsizetype>
+                                            </sizepolicy>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>minimumSize</name>
+                                            <size>
+                                                <width>70</width>
+                                                <height>0</height>
+                                            </size>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>maximumSize</name>
+                                            <size>
+                                                <width>70</width>
+                                                <height>32767</height>
+                                            </size>
+                                        </property>
+                                    </widget>
+                                </grid>
+                            </widget>
                     <widget row="2"  column="1" >
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>subjectLine</cstring>
                         </property>
+                                <property stdset="1">
+                                    <name>sizePolicy</name>
+                                    <sizepolicy>
+                                        <hsizetype>3</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                    </sizepolicy>
+                                </property>
                     </widget>
-                    <widget row="3"  column="0"  rowspan="1"  colspan="2" >
-                        <class>QMultiLineEdit</class>
+                            <widget row="1"  column="1" >
+                                <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>message</cstring>
+                                    <cstring>toLine</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>sizePolicy</name>
+                                    <sizepolicy>
+                                        <hsizetype>3</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                    </sizepolicy>
                         </property>
                     </widget>
                     <widget row="2"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>subjectLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Subject</string>
                         </property>
                     </widget>
                     <widget row="0"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>fromLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>From</string>
                         </property>
                     </widget>
-                    <widget row="1"  column="1" >
-                        <class>QLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>toLine</cstring>
-                        </property>
-                    </widget>
-                    <widget row="0"  column="1" >
-                        <class>QComboBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>fromBox</cstring>
-                        </property>
-                    </widget>
                     <widget row="1"  column="0" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>toButton</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>To</string>
                         </property>
                     </widget>
                 </grid>
             </widget>
             <widget>
+                        <class>QMultiLineEdit</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>message</cstring>
+                        </property>
+                    </widget>
+                </vbox>
+            </widget>
+            <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>optionsTab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Options</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>4</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>3</number>
                     </property>
                     <widget row="3"  column="0" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>replyButton</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Reply-To</string>
                         </property>
                     </widget>
                     <widget row="2"  column="0" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>bccButton</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>BCC</string>
                         </property>
                     </widget>
                     <widget row="1"  column="1" >
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>ccLine</cstring>
                         </property>
                     </widget>
                     <widget row="2"  column="1" >
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>bccLine</cstring>
                         </property>
                     </widget>
                     <widget row="3"  column="1" >
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>replyLine</cstring>
                         </property>
                     </widget>
                     <widget row="6"  column="0"  rowspan="1"  colspan="2" >
                         <class>QMultiLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>sigMultiLine</cstring>
                         </property>
                     </widget>
                     <widget row="5"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>sigLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Signature</string>
                         </property>
                     </widget>
                     <spacer row="4"  column="0" >
                         <property>
                             <name>name</name>
                             <cstring>Spacer3</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
                             <enum>Vertical</enum>
                         </property>
                         <property stdset="1">
                             <name>sizeType</name>
                             <enum>Expanding</enum>
                         </property>
                         <property>
                             <name>sizeHint</name>
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
                     <widget row="1"  column="0" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>ccButton</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>CC</string>
                         </property>
                     </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>attachTab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Attachment</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>4</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>3</number>
                     </property>
                     <widget row="0"  column="0"  rowspan="1"  colspan="3" >
                         <class>QListView</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>attList</cstring>
                         </property>
                         <property stdset="1">
                             <name>selectionMode</name>
                             <enum>Single</enum>
                         </property>
                         <property stdset="1">
                             <name>allColumnsShowFocus</name>
                             <bool>true</bool>
                         </property>
                         <property stdset="1">
                             <name>showSortIndicator</name>
                             <bool>true</bool>
                         </property>
                     </widget>
                     <widget row="1"  column="2" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>deleteButton</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Delete File</string>
                         </property>
                     </widget>
                     <widget row="1"  column="0" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>addButton</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Add File</string>
                         </property>
                     </widget>
                 </grid>
             </widget>
         </widget>
     </vbox>
 </widget>
 <tabstops>
     <tabstop>fromBox</tabstop>
     <tabstop>toButton</tabstop>
     <tabstop>toLine</tabstop>
     <tabstop>subjectLine</tabstop>
     <tabstop>message</tabstop>
     <tabstop>tabWidget</tabstop>
     <tabstop>ccButton</tabstop>
     <tabstop>ccLine</tabstop>
     <tabstop>bccButton</tabstop>
     <tabstop>bccLine</tabstop>
     <tabstop>replyButton</tabstop>
     <tabstop>replyLine</tabstop>
     <tabstop>sigMultiLine</tabstop>
diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp
index 1246037..de36e0d 100644
--- a/noncore/net/mail/editaccounts.cpp
+++ b/noncore/net/mail/editaccounts.cpp
@@ -166,306 +166,283 @@ void EditAccounts::slotEditMail()
         return;
     }
 
     Account *a = ((AccountListItem *) mailList->currentItem())->getAccount();
     slotEditAccount( a );
 }
 
 void EditAccounts::slotDeleteMail()
 {
     if ( !mailList->currentItem() ) {
         QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select an account.</p>" ),
                                   tr( "Ok" ) );
         return;
     }
 
     Account *a = ((AccountListItem *) mailList->currentItem())->getAccount();
     slotDeleteAccount( a );
 }
 
 void EditAccounts::slotNewNews()
 {
     qDebug( "New News Account" );
     slotNewAccount( "NNTP" );
 }
 
 void EditAccounts::slotEditNews()
 {
     qDebug( "Edit News Account" );
     if ( !newsList->currentItem() ) {
         QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select an account.</p>" ),
                                   tr( "Ok" ) );
         return;
     }
 
     Account *a = ((AccountListItem *) newsList->currentItem())->getAccount();
     slotEditAccount( a );
 }
 
 void EditAccounts::slotDeleteNews()
 {
     qDebug( "Delete News Account" );
     if ( !newsList->currentItem() ) {
         QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select an account.</p>" ),
                                   tr( "Ok" ) );
         return;
     }
 
     Account *a = ((AccountListItem *) newsList->currentItem())->getAccount();
     slotDeleteAccount( a );
 }
 
 void EditAccounts::slotAdjustColumns()
 {
     int currPage = configTab->currentPageIndex();
 
     configTab->showPage( mailTab );
     mailList->setColumnWidth( 0, mailList->visibleWidth() - 50 );
     mailList->setColumnWidth( 1, 50 );
 
     configTab->showPage( newsTab );
     newsList->setColumnWidth( 0, newsList->visibleWidth() );
 
     configTab->setCurrentPage( currPage );
 }
 
 void EditAccounts::accept()
 {
     settings->saveAccounts();
 
     QDialog::accept();
 }
 
 /**
  * SelectMailType
  */
 
 SelectMailType::SelectMailType( QString *selection, QWidget *parent, const char *name, bool modal, WFlags flags )
     : SelectMailTypeUI( parent, name, modal, flags )
 {
     selected = selection;
     selected->replace( 0, selected->length(), typeBox->currentText() );
     connect( typeBox, SIGNAL( activated( const QString & ) ), SLOT( slotSelection( const QString & ) ) );
 }
 
 void SelectMailType::slotSelection( const QString &sel )
 {
     selected->replace( 0, selected->length(), sel );
 }
 
 /**
  * IMAPconfig
  */
 
 IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
     : IMAPconfigUI( parent, name, modal, flags )
 {
     data = account;
 
     fillValues();
 
     connect( sslBox, SIGNAL( toggled( bool ) ), SLOT( slotSSL( bool ) ) );
 }
 
 void IMAPconfig::slotSSL( bool enabled )
 {
     if ( enabled ) {
         portLine->setText( IMAP_SSL_PORT );
     } else {
         portLine->setText( IMAP_PORT );
     }
 }
 
 void IMAPconfig::fillValues()
 {
     accountLine->setText( data->getAccountName() );
     serverLine->setText( data->getServer() );
     portLine->setText( data->getPort() );
     sslBox->setChecked( data->getSSL() );
     userLine->setText( data->getUser() );
     passLine->setText( data->getPassword() );
     prefixLine->setText(data->getPrefix());
 }
 
 void IMAPconfig::accept()
 {
     data->setAccountName( accountLine->text() );
     data->setServer( serverLine->text() );
     data->setPort( portLine->text() );
     data->setSSL( sslBox->isChecked() );
     data->setUser( userLine->text() );
     data->setPassword( passLine->text() );
     data->setPrefix(prefixLine->text());
 
     QDialog::accept();
 }
 
 /**
  * POP3config
  */
 
 POP3config::POP3config( POP3account *account, QWidget *parent, const char *name, bool modal, WFlags flags )
     : POP3configUI( parent, name, modal, flags )
 {
     data = account;
     fillValues();
 
     connect( sslBox, SIGNAL( toggled( bool ) ), SLOT( slotSSL( bool ) ) );
 }
 
 void POP3config::slotSSL( bool enabled )
 {
     if ( enabled ) {
         portLine->setText( POP3_SSL_PORT );
     } else {
         portLine->setText( POP3_PORT );
     }
 }
 
 void POP3config::fillValues()
 {
     accountLine->setText( data->getAccountName() );
     serverLine->setText( data->getServer() );
     portLine->setText( data->getPort() );
     sslBox->setChecked( data->getSSL() );
     userLine->setText( data->getUser() );
     passLine->setText( data->getPassword() );
 }
 
 void POP3config::accept()
 {
     data->setAccountName( accountLine->text() );
     data->setServer( serverLine->text() );
     data->setPort( portLine->text() );
     data->setSSL( sslBox->isChecked() );
     data->setUser( userLine->text() );
     data->setPassword( passLine->text() );
 
     QDialog::accept();
 }
 
 /**
  * SMTPconfig
  */
 
 SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
     : SMTPconfigUI( parent, name, modal, flags )
 {
     data = account;
 
-    connect( ccBox, SIGNAL( toggled( bool ) ), ccLine, SLOT( setEnabled( bool ) ) );
-    connect( bccBox, SIGNAL( toggled( bool ) ), bccLine, SLOT( setEnabled( bool ) ) );
-    connect( replyBox, SIGNAL( toggled( bool ) ), replyLine, SLOT( setEnabled( bool ) ) );
     connect( loginBox, SIGNAL( toggled( bool ) ), userLine, SLOT( setEnabled( bool ) ) );
     connect( loginBox, SIGNAL( toggled( bool ) ), passLine, SLOT( setEnabled( bool ) ) );
 
     fillValues();
 
     connect( sslBox, SIGNAL( toggled( bool ) ), SLOT( slotSSL( bool ) ) );
 }
 
 void SMTPconfig::slotSSL( bool enabled )
 {
     if ( enabled ) {
         portLine->setText( SMTP_SSL_PORT );
     } else {
         portLine->setText( SMTP_PORT );
     }
 }
 
 void SMTPconfig::fillValues()
 {
     accountLine->setText( data->getAccountName() );
     serverLine->setText( data->getServer() );
     portLine->setText( data->getPort() );
     sslBox->setChecked( data->getSSL() );
     loginBox->setChecked( data->getLogin() );
     userLine->setText( data->getUser() );
     passLine->setText( data->getPassword() );
-    nameLine->setText( data->getName() );
-    mailLine->setText( data->getMail() );
-    orgLine->setText( data->getOrg() );
-    ccBox->setChecked( data->getUseCC() );
-    ccLine->setText( data->getCC() );
-    bccBox->setChecked( data->getUseBCC() );
-    bccLine->setText( data->getBCC() );
-    replyBox->setChecked( data->getUseReply() );
-    replyLine->setText( data->getReply() );
-    sigMultiLine->setText( data->getSignature() );
 }
 
 void SMTPconfig::accept()
 {
     data->setAccountName( accountLine->text() );
     data->setServer( serverLine->text() );
     data->setPort( portLine->text() );
     data->setSSL( sslBox->isChecked() );
     data->setLogin( loginBox->isChecked() );
     data->setUser( userLine->text() );
     data->setPassword( passLine->text() );
-    data->setName( nameLine->text() );
-    data->setMail( mailLine->text() );
-    data->setOrg( orgLine->text() );
-    data->setCC( ccLine->text() );
-    data->setUseCC( ccBox->isChecked() );
-    data->setBCC( bccLine->text() );
-    data->setUseBCC( bccBox->isChecked() );
-    data->setReply( replyLine->text() );
-    data->setUseReply( replyBox->isChecked() );
-    data->setSignature( sigMultiLine->text() );
 
     QDialog::accept();
 }
 
 /**
  * NNTPconfig
  */
 
 NNTPconfig::NNTPconfig( NNTPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
     : NNTPconfigUI( parent, name, modal, flags )
 {
     data = account;
 
     connect( loginBox, SIGNAL( toggled( bool ) ), userLine, SLOT( setEnabled( bool ) ) );
     connect( loginBox, SIGNAL( toggled( bool ) ), passLine, SLOT( setEnabled( bool ) ) );
 
     fillValues();
 
     connect( sslBox, SIGNAL( toggled( bool ) ), SLOT( slotSSL( bool ) ) );
 }
 
 void NNTPconfig::slotSSL( bool enabled )
 {
     if ( enabled ) {
         portLine->setText( NNTP_SSL_PORT );
     } else {
         portLine->setText( NNTP_PORT );
     }
 }
 
 void NNTPconfig::fillValues()
 {
     accountLine->setText( data->getAccountName() );
     serverLine->setText( data->getServer() );
     portLine->setText( data->getPort() );
     sslBox->setChecked( data->getSSL() );
     loginBox->setChecked( data->getLogin() );
     userLine->setText( data->getUser() );
     passLine->setText( data->getPassword() );
 }
 
 void NNTPconfig::accept()
 {
     data->setAccountName( accountLine->text() );
     data->setServer( serverLine->text() );
     data->setPort( portLine->text() );
     data->setSSL( sslBox->isChecked() );
     data->setLogin( loginBox->isChecked() );
     data->setUser( userLine->text() );
     data->setPassword( passLine->text() );
 
     QDialog::accept();
 }
 
diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp
index b580954..17aa1b0 100644
--- a/noncore/net/mail/libmailwrapper/settings.cpp
+++ b/noncore/net/mail/libmailwrapper/settings.cpp
@@ -84,345 +84,320 @@ void Settings::saveAccounts()
 }
 
 void Settings::readAccounts()
 {
     checkDirectory(); 
     Account *it;
 
     for ( it = accounts.first(); it; it = accounts.next() ) {
         it->read();
     }
 }
 
 Account::Account()
 {
     accountName = "changeMe";
     type = "changeMe";
     ssl = false;
 }
 
 void Account::remove()
 {
     QFile file( getFileName() );
     file.remove();
 }
 
 IMAPaccount::IMAPaccount()
     : Account()
 {
     file = IMAPaccount::getUniqueFileName();
     accountName = "New IMAP Account";
     ssl = false;
     type = "IMAP";
     port = IMAP_PORT;
 }
 
 IMAPaccount::IMAPaccount( QString filename )
     : Account()
 {
     file = filename;
     accountName = "New IMAP Account";
     ssl = false;
     type = "IMAP";
     port = IMAP_PORT;
 }
 
 QString IMAPaccount::getUniqueFileName()
 {
     int num = 0;
     QString unique;
     
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
     QStringList imap = dir.entryList( "imap-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "imap-" + unique ) > 0 );
 
     return unique;
 }
 
 void IMAPaccount::read()
 {
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "IMAP Account" );
     accountName = conf->readEntry( "Account","" );
     if (accountName.isNull()) accountName = "";
     server = conf->readEntry( "Server","" );
     if (server.isNull()) server="";
     port = conf->readEntry( "Port","" );
     if (port.isNull()) port="143";
     ssl = conf->readBoolEntry( "SSL",false );
     user = conf->readEntry( "User","" );
     if (user.isNull()) user = "";
     password = conf->readEntryCrypt( "Password","" );
     if (password.isNull()) password = "";
     prefix = conf->readEntry("MailPrefix","");
     if (prefix.isNull()) prefix = "";
 }
 
 void IMAPaccount::save()
 {
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
     
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "IMAP Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->writeEntry( "MailPrefix",prefix);
     conf->write();
 }
 
 
 QString IMAPaccount::getFileName()
 {
     return (QString) getenv( "HOME" ) + "/Applications/opiemail/imap-" + file;
 }
 
 POP3account::POP3account()
     : Account()
 {
     file = POP3account::getUniqueFileName();
     accountName = "New POP3 Account";
     ssl = false;
     type = "POP3";
     port = POP3_PORT;
 }
 
 POP3account::POP3account( QString filename )
     : Account()
 {
     file = filename;
     accountName = "New POP3 Account";
     ssl = false;
     type = "POP3";
     port = POP3_PORT;
 }
 
 QString POP3account::getUniqueFileName()
 {
     int num = 0;
     QString unique;
     
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
     QStringList imap = dir.entryList( "pop3-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "pop3-" + unique ) > 0 );
 
     return unique;
 }
 
 void POP3account::read()
 {
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "POP3 Account" );
     accountName = conf->readEntry( "Account" );
     server = conf->readEntry( "Server" );
     port = conf->readEntry( "Port" );
     ssl = conf->readBoolEntry( "SSL" );
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
 }
 
 void POP3account::save()
 {
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
     
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "POP3 Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->write();
 }
 
 
 QString POP3account::getFileName()
 {
     return (QString) getenv( "HOME" ) + "/Applications/opiemail/pop3-" + file;
 }
 
 SMTPaccount::SMTPaccount()
     : Account()
 {
     file = SMTPaccount::getUniqueFileName();
     accountName = "New SMTP Account";
     ssl = false;
     login = false;
     useCC = false;
     useBCC = false;
     useReply = false;
     type = "SMTP";
     port = SMTP_PORT;
 }
 
 SMTPaccount::SMTPaccount( QString filename )
     : Account()
 {
     file = filename;
     accountName = "New SMTP Account";
     ssl = false;
     login = false;
-    useCC = false;
-    useBCC = false;
-    useReply = false;
     type = "SMTP";
     port = SMTP_PORT;
 }
 
 QString SMTPaccount::getUniqueFileName()
 {
     int num = 0;
     QString unique;
     
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
     QStringList imap = dir.entryList( "smtp-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "smtp-" + unique ) > 0 );
 
     return unique;
 }
 
 void SMTPaccount::read()
 {
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "SMTP Account" );
     accountName = conf->readEntry( "Account" );
     server = conf->readEntry( "Server" );
     port = conf->readEntry( "Port" );
     ssl = conf->readBoolEntry( "SSL" );
     login = conf->readBoolEntry( "Login" );
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
-    useCC = conf->readBoolEntry( "useCC" );
-    useBCC = conf->readBoolEntry( "useBCC" );
-    useReply = conf->readBoolEntry( "useReply" );
-    name = conf->readEntry( "Name" );
-    mail = conf->readEntry( "Mail" );
-    org = conf->readEntry( "Org" );
-    cc = conf->readEntry( "CC" );
-    bcc = conf->readEntry( "BCC" );
-    reply = conf->readEntry( "Reply" );
-    signature = conf->readEntry( "Signature" );
-    signature = signature.replace( QRegExp( "<br>" ), "\n" );
 }
 
 void SMTPaccount::save()
 {
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
     
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "SMTP Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "Login", login );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
-    conf->writeEntry( "useCC", useCC );
-    conf->writeEntry( "useBCC", useBCC );
-    conf->writeEntry( "useReply", useReply );
-    conf->writeEntry( "Name", name );
-    conf->writeEntry( "Mail", mail );
-    conf->writeEntry( "Org", org );
-    conf->writeEntry( "CC", cc );
-    conf->writeEntry( "BCC", bcc );
-    conf->writeEntry( "Reply", reply );
-    conf->writeEntry( "Signature", 
-                      signature.replace( QRegExp( "\\n" ), "<br>" ) );
     conf->write();
 }
 
 
 QString SMTPaccount::getFileName()
 {
     return (QString) getenv( "HOME" ) + "/Applications/opiemail/smtp-" + file;
 }
 
 NNTPaccount::NNTPaccount()
     : Account()
 {
     file = NNTPaccount::getUniqueFileName();
     accountName = "New NNTP Account";
     ssl = false;
     login = false;
     type = "NNTP";
     port = NNTP_PORT;
 }
 
 NNTPaccount::NNTPaccount( QString filename )
     : Account()
 {
     file = filename;
     accountName = "New NNTP Account";
     ssl = false;
     login = false;
     type = "NNTP";
     port = NNTP_PORT;
 }
 
 QString NNTPaccount::getUniqueFileName()
 {
     int num = 0;
     QString unique;
     
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
     QStringList imap = dir.entryList( "nntp-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "nntp-" + unique ) > 0 );
 
     return unique;
 }
 
 void NNTPaccount::read()
 {
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "NNTP Account" );
     accountName = conf->readEntry( "Account" );
     server = conf->readEntry( "Server" );
     port = conf->readEntry( "Port" );
     ssl = conf->readBoolEntry( "SSL" );
     login = conf->readBoolEntry( "Login" );
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
 }
 
 void NNTPaccount::save()
 {
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
     
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "NNTP Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "Login", login );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->write();
 }
 
 
 QString NNTPaccount::getFileName()
 {
     return (QString) getenv( "HOME" ) + "/Applications/opiemail/nntp-" + file;
 }
 
diff --git a/noncore/net/mail/libmailwrapper/settings.h b/noncore/net/mail/libmailwrapper/settings.h
index 22184a5..caa5dfc 100644
--- a/noncore/net/mail/libmailwrapper/settings.h
+++ b/noncore/net/mail/libmailwrapper/settings.h
@@ -1,166 +1,146 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
 #include <qobject.h>
 #include <qlist.h>
 
 class Account 
 {
     
 public:
     Account();
     virtual ~Account() {}
 
     void remove();
     void setAccountName( QString name ) { accountName = name; }
     const QString&getAccountName()const{ return accountName; }
     const QString&getType()const{ return type; }
     
     void setServer(const QString&str){ server = str; }
     const QString&getServer()const{ return server; }
     
     void setPort(const QString&str) { port = str; }
     const QString&getPort()const{ return port; }
     
     void setUser(const QString&str){ user = str; }
     const QString&getUser()const{ return user; }
     
     void setPassword(const QString&str) { password = str; }
     const QString&getPassword()const { return password; }
     
     void setSSL( bool b ) { ssl = b; }
     bool getSSL() { return ssl; }
 
     virtual QString getFileName() { return accountName; }
     virtual void read() { qDebug( "base reading..." ); }
     virtual void save() { qDebug( "base saving..." ); }
 
 protected:
     QString accountName, type, server, port, user, password;
     bool ssl;
     
 };
 
 class IMAPaccount : public Account
 {
         
 public:
     IMAPaccount();
     IMAPaccount( QString filename );
 
     static QString getUniqueFileName();
 
     virtual void read();
     virtual void save();
     virtual QString getFileName();
 
     void setPrefix(const QString&str) {prefix=str;}
     const QString&getPrefix()const{return prefix;}
 
 private:
     QString file,prefix;
 
 };
 
 class POP3account : public Account
 {
         
 public:
     POP3account();
     POP3account( QString filename );
 
     static QString getUniqueFileName();
 
     virtual void read();
     virtual void save();
     virtual QString getFileName();
 
 private:
     QString file;
     
 };
 
 class SMTPaccount : public Account
 {
     
 public:
     SMTPaccount();
     SMTPaccount( QString filename );
 
     static QString getUniqueFileName();
 
     virtual void read();
     virtual void save();
     virtual QString getFileName();
 
-    void setName( QString str ) { name = str; }
-    QString getName() { return name; }
-    void setMail( QString str ) { mail = str; }
-    QString getMail() { return mail; }
-    void setOrg( QString str ) { org = str; }
-    QString getOrg() { return org; }
-    void setUseCC( bool b ) { useCC = b; }
-    bool getUseCC() { return useCC; }
-    void setCC( QString str ) { cc = str; }
-    QString getCC() { return cc; }
-    void setUseBCC( bool b ) { useBCC = b; }
-    bool getUseBCC() { return useBCC; }
-    void setBCC( QString str ) { bcc = str; }
-    QString getBCC() { return bcc; }
-    void setUseReply( bool b ) { useReply = b; }
-    bool getUseReply() { return useReply; }
-    void setReply( QString str ) { reply = str; }
-    QString getReply() { return reply; }
-    void setSignature( QString str ) { signature = str; }
-    QString getSignature() { return signature; }
     void setLogin( bool b ) { login = b; }
     bool getLogin() { return login; }
 
 private:
     QString file, name, mail, org, cc, bcc, reply, signature;
     bool useCC, useBCC, useReply, login;
 
 };
 
 class NNTPaccount : public Account
 {
         
 public:
     NNTPaccount();
     NNTPaccount( QString filename );
 
     static QString getUniqueFileName();
 
     virtual void read();
     virtual void save();
     virtual QString getFileName();
 
     void setLogin( bool b ) { login = b; }
     bool getLogin() { return login; }
 
 private:
     QString file;
     bool login;
 
 };
 
 class Settings : public QObject
 {
     Q_OBJECT
 
 public:
     Settings();
     QList<Account> getAccounts();
     void addAccount(Account *account);
     void delAccount(Account *account);
     void saveAccounts();
     void readAccounts();
     static void checkDirectory();
 
 private:
     void updateAccounts();
     QList<Account> accounts;
         
 };
 
 #endif
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index 521cd0a..30c0707 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -1,726 +1,710 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <qdir.h>
 #include <qt.h>
 
 #include <libetpan/libetpan.h>
 
 #include "smtpwrapper.h"
 #include "mailwrapper.h"
 #include "mboxwrapper.h"
 #include "logindialog.h"
 #include "mailtypes.h"
 #include "defines.h"
 #include "sendmailprogress.h"
 
 progressMailSend*SMTPwrapper::sendProgress = 0;
 
 SMTPwrapper::SMTPwrapper( Settings *s )
     : QObject()
 {
     settings = s;
 }
 
 QString SMTPwrapper::mailsmtpError( int errnum )
 {
     switch ( errnum ) {
         case MAILSMTP_NO_ERROR:
             return tr( "No error" );
         case MAILSMTP_ERROR_UNEXPECTED_CODE:
             return tr( "Unexpected error code" );
         case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE:
             return tr( "Service not available" );
         case MAILSMTP_ERROR_STREAM:
             return tr( "Stream error" );
         case MAILSMTP_ERROR_HOSTNAME:
             return tr( "gethostname() failed" );
         case MAILSMTP_ERROR_NOT_IMPLEMENTED:
             return tr( "Not implemented" );
         case MAILSMTP_ERROR_ACTION_NOT_TAKEN:
             return tr( "Error, action not taken" );
         case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION:
             return tr( "Data exceeds storage allocation" );
         case MAILSMTP_ERROR_IN_PROCESSING:
             return tr( "Error in processing" );
   //      case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE:
     //        return tr( "Insufficient system storage" );
         case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE:
             return tr( "Mailbox unavailable" );
         case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED:
             return tr( "Mailbox name not allowed" );
         case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND:
             return tr( "Bad command sequence" );
         case MAILSMTP_ERROR_USER_NOT_LOCAL:
             return tr( "User not local" );
         case MAILSMTP_ERROR_TRANSACTION_FAILED:
             return tr( "Transaction failed" );
         case MAILSMTP_ERROR_MEMORY:
             return tr( "Memory error" );
         case MAILSMTP_ERROR_CONNECTION_REFUSED:
             return tr( "Connection refused" );
         default:
             return tr( "Unknown error code" );
     }
 }
 
 mailimf_mailbox *SMTPwrapper::newMailbox(const QString&name, const QString&mail )
 {
     return mailimf_mailbox_new( strdup( name.latin1() ),
                                 strdup( mail.latin1() ) );
 }
 
 mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr )
 {
     mailimf_address_list *addresses;
 
     if ( addr.isEmpty() ) return NULL;
 
     addresses = mailimf_address_list_new_empty();
 
     bool literal_open = false;
     unsigned int startpos = 0;
     QStringList list;
     QString s;
     unsigned int i = 0;
     for (; i < addr.length();++i) {
         switch (addr[i]) {
         case '\"':
             literal_open = !literal_open;
             break;
         case ',':
             if (!literal_open) {
                 s = addr.mid(startpos,i-startpos);
                 if (!s.isEmpty()) {
                     list.append(s);
                     qDebug("Appended %s",s.latin1());
                 }
                 // !!!! this is a MUST BE!
                 startpos = ++i;
             }
             break;
         default:
             break;
         }
     }
     s = addr.mid(startpos,i-startpos);
     if (!s.isEmpty()) {
        list.append(s);
        qDebug("Appended %s",s.latin1());
     }
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); it++ ) {
         int err = mailimf_address_list_add_parse( addresses, (char*)(*it).latin1() );
         if ( err != MAILIMF_NO_ERROR ) {
             qDebug( "Error parsing" );
             qDebug( *it );
         } else {
             qDebug( "Parse success! %s",(*it).latin1());
         }
     }
     return addresses;
 }
 
 mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail )
 {
     mailimf_fields *fields;
     mailimf_field *xmailer;
-    mailimf_mailbox *sender, *fromBox;
-    mailimf_mailbox_list *from;
-    mailimf_address_list *to, *cc, *bcc, *reply;
+    mailimf_mailbox *sender=0,*fromBox=0;
+    mailimf_mailbox_list *from=0;
+    mailimf_address_list *to=0, *cc=0, *bcc=0, *reply=0;
     char *subject = strdup( mail.getSubject().latin1() );
     int err;
 
     sender = newMailbox( mail.getName(), mail.getMail() );
     if ( sender == NULL ) goto err_free;
 
     fromBox = newMailbox( mail.getName(), mail.getMail() );
     if ( fromBox == NULL ) goto err_free_sender;
 
     from = mailimf_mailbox_list_new_empty();
     if ( from == NULL ) goto err_free_fromBox;
 
     err = mailimf_mailbox_list_add( from, fromBox );
     if ( err != MAILIMF_NO_ERROR ) goto err_free_from;
 
     to = parseAddresses( mail.getTo() );
     if ( to == NULL ) goto err_free_from;
 
     cc = parseAddresses( mail.getCC() );
     bcc = parseAddresses( mail.getBCC() );
     reply = parseAddresses( mail.getReply() );
 
     fields = mailimf_fields_new_with_data( from, sender, reply, to, cc, bcc,
                                            NULL, NULL, subject );
     if ( fields == NULL ) goto err_free_reply;
 
     xmailer = mailimf_field_new_custom( strdup( "User-Agent" ),
                                         strdup( USER_AGENT ) );
     if ( xmailer == NULL ) goto err_free_fields;
 
     err = mailimf_fields_add( fields, xmailer );
     if ( err != MAILIMF_NO_ERROR ) goto err_free_xmailer;
 
     return fields;      // Success :)
 
 err_free_xmailer:
-    mailimf_field_free( xmailer );
+    if (xmailer) mailimf_field_free( xmailer );
 err_free_fields:
-    mailimf_fields_free( fields );
+    if (fields) mailimf_fields_free( fields );
 err_free_reply:
-    mailimf_address_list_free( reply );
-    mailimf_address_list_free( bcc );
-    mailimf_address_list_free( cc );
-    mailimf_address_list_free( to );
+    if (reply) mailimf_address_list_free( reply );
+    if (bcc) mailimf_address_list_free( bcc );
+    if (cc) mailimf_address_list_free( cc );
+    if (to) mailimf_address_list_free( to );
 err_free_from:
-    mailimf_mailbox_list_free( from );
+    if (from) mailimf_mailbox_list_free( from );
 err_free_fromBox:
     mailimf_mailbox_free( fromBox );
 err_free_sender:
-    mailimf_mailbox_free( sender );
+    if (sender) mailimf_mailbox_free( sender );
 err_free:
-    free( subject );
+    if (subject) free( subject );
     qDebug( "createImfFields - error" );
 
     return NULL;        // Error :(
 }
 
 mailmime *SMTPwrapper::buildTxtPart(const QString&str )
 {
     mailmime *txtPart;
     mailmime_fields *fields;
     mailmime_content *content;
     mailmime_parameter *param;
     int err;
 
     param = mailmime_parameter_new( strdup( "charset" ),
                                     strdup( "iso-8859-1" ) );
     if ( param == NULL ) goto err_free;
 
     content = mailmime_content_new_with_str( "text/plain" );
     if ( content == NULL ) goto err_free_param;
 
     err = clist_append( content->ct_parameters, param );
     if ( err != MAILIMF_NO_ERROR ) goto err_free_content;
 
-    fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_QUOTED_PRINTABLE);
+    fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_8BIT);
     if ( fields == NULL ) goto err_free_content;
 
     txtPart = mailmime_new_empty( content, fields );
     if ( txtPart == NULL ) goto err_free_fields;
 
     err = mailmime_set_body_text( txtPart, (char*)str.data(), str.length() );
     if ( err != MAILIMF_NO_ERROR ) goto err_free_txtPart;
 
     return txtPart;     // Success :)
 
 err_free_txtPart:
     mailmime_free( txtPart );
 err_free_fields:
     mailmime_fields_free( fields );
 err_free_content:
     mailmime_content_free( content );
 err_free_param:
     mailmime_parameter_free( param );
 err_free:
     qDebug( "buildTxtPart - error" );
 
     return NULL;        // Error :(
 }
 
 mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimetype,const QString&TextContent )
 {
     mailmime * filePart = 0;
     mailmime_fields * fields = 0;
     mailmime_content * content = 0;
     mailmime_parameter * param = 0;
     char*name = 0;
     char*file = 0;
     int err;
 
     int pos = filename.findRev( '/' );
 
     if (filename.length()>0) {
         QString tmp = filename.right( filename.length() - ( pos + 1 ) );
         name = strdup( tmp.latin1() );        // just filename
         file = strdup( filename.latin1() );   // full name with path
     }
     
     int disptype = MAILMIME_DISPOSITION_TYPE_ATTACHMENT;
     int mechanism = MAILMIME_MECHANISM_BASE64;
 
     if ( mimetype.startsWith( "text/" ) ) {
         param = mailmime_parameter_new( strdup( "charset" ),
                                         strdup( "iso-8859-1" ) );
         mechanism = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
     }
 
     fields = mailmime_fields_new_filename(
                 disptype, name,
                 mechanism );
     content = mailmime_content_new_with_str( (char*)mimetype.latin1() );
     if (content!=0 && fields != 0) {
         if (param) {
             clist_append(content->ct_parameters,param);
             param = 0;
         }
         if (filename.length()>0) {
             QFileInfo f(filename);
             param = mailmime_parameter_new(strdup("name"),strdup(f.fileName().latin1()));
             clist_append(content->ct_parameters,param);
             param = 0;
         }
         filePart = mailmime_new_empty( content, fields );
     }
     if (filePart) {
         if (filename.length()>0) {
             err = mailmime_set_body_file( filePart, file );
         } else {
             err = mailmime_set_body_text(filePart,strdup(TextContent.data()),TextContent.length());
         }
         if (err != MAILIMF_NO_ERROR) {
             qDebug("Error setting body with file %s",file);
             mailmime_free( filePart );
             filePart = 0;
         }
     }
 
     if (!filePart) {
         if ( param != NULL ) {
             mailmime_parameter_free( param );
         }
         if (content) {
             mailmime_content_free( content );
         }
         if (fields) {
             mailmime_fields_free( fields );
         } else {
             if (name) {
                 free( name );
             }
             if (file) {
                 free( file );
             }
         }
     }
     return filePart;        // Success :)
 
 }
 
 void SMTPwrapper::addFileParts( mailmime *message,const QList<Attachment>&files )
 {
     const Attachment *it;
     unsigned int count = files.count();
     qDebug("List contains %i values",count);
     for ( unsigned int i = 0; i < count; ++i ) {
         qDebug( "Adding file" );
         mailmime *filePart;
         int err;
         it = ((QList<Attachment>)files).at(i);
 
         filePart = buildFilePart( it->getFileName(), it->getMimeType(),"" );
         if ( filePart == NULL ) {
             qDebug( "addFileParts: error adding file:" );
             qDebug( it->getFileName() );
             continue;
         }
         err = mailmime_smart_add_part( message, filePart );
         if ( err != MAILIMF_NO_ERROR ) {
             mailmime_free( filePart );
             qDebug("error smart add");
         }
     }
 }
 
 mailmime *SMTPwrapper::createMimeMail(const Mail &mail )
 {
     mailmime *message, *txtPart;
     mailimf_fields *fields;
     int err;
 
     fields = createImfFields( mail );
     if ( fields == NULL ) goto err_free;
 
     message = mailmime_new_message_data( NULL );
     if ( message == NULL ) goto err_free_fields;
 
     mailmime_set_imf_fields( message, fields );
 
     txtPart = buildTxtPart( mail.getMessage() );
     
     if ( txtPart == NULL ) goto err_free_message;
 
     err = mailmime_smart_add_part( message, txtPart );
     if ( err != MAILIMF_NO_ERROR ) goto err_free_txtPart;
 
     addFileParts( message, mail.getAttachments() );
 
     return message;         // Success :)
 
 err_free_txtPart:
     mailmime_free( txtPart );
 err_free_message:
     mailmime_free( message );
 err_free_fields:
     mailimf_fields_free( fields );
 err_free:
     qDebug( "createMimeMail: error" );
 
     return NULL;            // Error :(
 }
 
 mailimf_field *SMTPwrapper::getField( mailimf_fields *fields, int type )
 {
     mailimf_field *field;
     clistiter *it;
 
     it = clist_begin( fields->fld_list );
     while ( it ) {
         field = (mailimf_field *) it->data;
         if ( field->fld_type == type ) {
             return field;
         }
         it = it->next;
     }
 
     return NULL;
 }
 
 void SMTPwrapper::addRcpts( clist *list, mailimf_address_list *addr_list )
 {
     clistiter *it, *it2;
 
     for ( it = clist_begin( addr_list->ad_list ); it; it = it->next ) {
         mailimf_address *addr;
         addr = (mailimf_address *) it->data;
 
         if ( addr->ad_type == MAILIMF_ADDRESS_MAILBOX ) {
     	    esmtp_address_list_add( list, addr->ad_data.ad_mailbox->mb_addr_spec, 0, NULL );
         } else if ( addr->ad_type == MAILIMF_ADDRESS_GROUP ) {
             clist *l = addr->ad_data.ad_group->grp_mb_list->mb_list;
     	    for ( it2 = clist_begin( l ); it2; it2 = it2->next ) {
                 mailimf_mailbox *mbox;
     	        mbox = (mailimf_mailbox *) it2->data;
 	            esmtp_address_list_add( list, mbox->mb_addr_spec, 0, NULL );
 	        }
 	    }
     }
 }
 
 clist *SMTPwrapper::createRcptList( mailimf_fields *fields )
 {
     clist *rcptList;
     mailimf_field *field;
 
     rcptList = esmtp_address_list_new();
 
     field = getField( fields, MAILIMF_FIELD_TO );
     if ( field && (field->fld_type == MAILIMF_FIELD_TO)
          && field->fld_data.fld_to->to_addr_list ) {
         addRcpts( rcptList, field->fld_data.fld_to->to_addr_list );
     }
 
     field = getField( fields, MAILIMF_FIELD_CC );
     if ( field && (field->fld_type == MAILIMF_FIELD_CC)
          && field->fld_data.fld_cc->cc_addr_list ) {
         addRcpts( rcptList, field->fld_data.fld_cc->cc_addr_list );
     }
 
     field = getField( fields, MAILIMF_FIELD_BCC );
     if ( field && (field->fld_type == MAILIMF_FIELD_BCC)
          && field->fld_data.fld_bcc->bcc_addr_list ) {
         addRcpts( rcptList, field->fld_data.fld_bcc->bcc_addr_list );
     }
 
     return rcptList;
 }
 
 char *SMTPwrapper::getFrom( mailimf_field *ffrom)
 {
     char *from = NULL;
     if ( ffrom && (ffrom->fld_type == MAILIMF_FIELD_FROM)
          && ffrom->fld_data.fld_from->frm_mb_list && ffrom->fld_data.fld_from->frm_mb_list->mb_list ) {
         clist *cl = ffrom->fld_data.fld_from->frm_mb_list->mb_list;
         clistiter *it;
         for ( it = clist_begin( cl ); it; it = it->next ) {
             mailimf_mailbox *mb = (mailimf_mailbox *) it->data;
             from = strdup( mb->mb_addr_spec );
         }
     }
 
     return from;
 }
 
 char *SMTPwrapper::getFrom( mailmime *mail )
 {
     /* no need to delete - its just a pointer to structure content */
     mailimf_field *ffrom = 0;
     ffrom = getField( mail->mm_data.mm_message.mm_fields, MAILIMF_FIELD_FROM );
     return getFrom(ffrom);
 }
 
-SMTPaccount *SMTPwrapper::getAccount(const QString&name )
-{
-    SMTPaccount *smtp;
-
-    QList<Account> list = settings->getAccounts();
-    Account *it;
-    for ( it = list.first(); it; it = list.next() ) {
-        if ( it->getType().compare( "SMTP" ) == 0 ) {
-            smtp = static_cast<SMTPaccount *>(it);
-            if ( smtp->getName()== name ) {
-                qDebug( "SMTPaccount found for" );
-                qDebug( name );
-                return smtp;
-            }
-        }
-    }
-
-    return NULL;
-}
-
 void SMTPwrapper::progress( size_t current, size_t maximum )
 {
     if (SMTPwrapper::sendProgress) {
         SMTPwrapper::sendProgress->setSingleMail(current, maximum );
         qApp->processEvents();
     }
 }
 
 void SMTPwrapper::storeMail(char*mail, size_t length, const QString&box)
 {
     if (!mail) return;
     QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
     MBOXwrapper*wrap = new MBOXwrapper(localfolders);
     wrap->storeMessage(mail,length,box);
     delete wrap;
 }
 
 void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
 {
     clist *rcpts = 0;
     char *from, *data;
     size_t size;
 
     if ( smtp == NULL ) {
         return;
     }
     from = data = 0;
     
     mailmessage * msg = 0;
     msg = mime_message_init(mail);
     mime_message_set_tmpdir(msg,getenv( "HOME" ));
     int r = mailmessage_fetch(msg,&data,&size);
     mime_message_detach_mime(msg);
     mailmessage_free(msg);
     if (r != MAIL_NO_ERROR || !data) {
         if (data) free(data);
         qDebug("Error fetching mime...");
         return;
     }
     QString tmp = data;
     tmp.replace(QRegExp("\r+",true,false),"");
     msg = 0;
     if (later) {
         storeMail((char*)tmp.data(),tmp.length(),"Outgoing");
         if (data) free( data );
         return;
     }
     from = getFrom( mail );
     rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );
     smtpSend(from,rcpts,data,size,smtp);
     if (data) {free(data);}
     if (from) {free(from);}
     if (rcpts) smtp_address_list_free( rcpts );
 }
 
 int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp )
 {
     char *server, *user, *pass;
     bool ssl;
     uint16_t port;
     mailsmtp *session;
     int err,result;
 
     result = 1;
     server = user = pass = 0;
     server = strdup( smtp->getServer().latin1() );
     ssl = smtp->getSSL();
     port = smtp->getPort().toUInt();
 
     session = mailsmtp_new( 20, &progress );
     if ( session == NULL ) goto free_mem;
 
     qDebug( "Servername %s at port %i", server, port );
     if ( ssl ) {
         qDebug( "SSL session" );
         err = mailsmtp_ssl_connect( session, server, port );
     } else {
         qDebug( "No SSL session" );
         err = mailsmtp_socket_connect( session, server, port );
     }
     if ( err != MAILSMTP_NO_ERROR ) {result = 0;goto free_mem_session;}
 
     err = mailsmtp_init( session );
     if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;}
 
     qDebug( "INIT OK" );
 
     if ( smtp->getLogin() ) {
         if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
             // get'em
             LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true );
             login.show();
             if ( QDialog::Accepted == login.exec() ) {
                 // ok
                 user = strdup( login.getUser().latin1() );
                 pass = strdup( login.getPassword().latin1() );
             } else {
                 result = 0; goto free_con_session;
             }
         } else {
             user = strdup( smtp->getUser().latin1() );
             pass = strdup( smtp->getPassword().latin1() );
         }
         qDebug( "session->auth: %i", session->auth);
         err = mailsmtp_auth( session, user, pass );
         if ( err == MAILSMTP_NO_ERROR ) qDebug("auth ok");
         qDebug( "Done auth!" );
     }
 
     err = mailsmtp_send( session, from, rcpts, data, size );
     if ( err != MAILSMTP_NO_ERROR ) {
         qDebug("Error sending mail: %s",mailsmtpError(err).latin1());
         result = 0; goto free_con_session;
     }
 
     qDebug( "Mail sent." );
     storeMail(data,size,"Sent");
 
 free_con_session:
     mailsmtp_quit( session );
 free_mem_session:
     mailsmtp_free( session );
 free_mem:
     if (server) free( server );
     if ( smtp->getLogin() ) {
         free( user );
         free( pass );
     }
     return result;
 }
 
-void SMTPwrapper::sendMail(const Mail&mail,bool later )
+void SMTPwrapper::sendMail(const Mail&mail,SMTPaccount*aSmtp,bool later )
 {
     mailmime * mimeMail;
 
-    SMTPaccount *smtp = getAccount(mail.getName());
+    SMTPaccount *smtp = aSmtp;
 
+    if (!later && !smtp) {
+        qDebug("Didn't get any send method - giving up");
+        return;
+    }
     mimeMail = createMimeMail(mail );
     if ( mimeMail == NULL ) {
         qDebug( "sendMail: error creating mime mail" );
     } else {
         sendProgress = new progressMailSend();
         sendProgress->show();
         sendProgress->setMaxMails(1);
         smtpSend( mimeMail,later,smtp);
         qDebug("Clean up done");
         sendProgress->hide();
         delete sendProgress;
         sendProgress = 0;
         mailmime_free( mimeMail );
     }
 }
 
 int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
 {
     char*data = 0;
     size_t length = 0;
     size_t curTok = 0;
     mailimf_fields *fields = 0;
     mailimf_field*ffrom = 0;
     clist *rcpts = 0;
     char*from = 0;
     int res = 0;
 
     wrap->fetchRawBody(*which,&data,&length);
     if (!data) return 0;
     int err = mailimf_fields_parse( data, length, &curTok, &fields );
     if (err != MAILIMF_NO_ERROR) {
         free(data);
         delete wrap;
         return 0;
     }
 
     rcpts = createRcptList( fields );
     ffrom = getField(fields, MAILIMF_FIELD_FROM );
     from = getFrom(ffrom);
 
     qDebug("Size: %i vs. %i",length,strlen(data));
     if (rcpts && from) {
         res = smtpSend(from,rcpts,data,length,smtp );
     }
     if (fields) {
         mailimf_fields_free(fields);
         fields = 0;
     }
     if (data) {
         free(data);
     }    
     if (from) {
         free(from);
     }
     if (rcpts) {
         smtp_address_list_free( rcpts );
     }
     return res;
 }
 
 /* this is a special fun */
 bool SMTPwrapper::flushOutbox(SMTPaccount*smtp)
 {
     bool returnValue = true;
 
     if (!smtp) return false;
 
     QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
     MBOXwrapper*wrap = new MBOXwrapper(localfolders);
     if (!wrap) {
         qDebug("memory error");
         return false;
     }
     QList<RecMail> mailsToSend;
     QList<RecMail> mailsToRemove;
     QString mbox("Outgoing");
     wrap->listMessages(mbox,mailsToSend);
     if (mailsToSend.count()==0) {
         delete wrap;
         return false;
     }
     mailsToSend.setAutoDelete(false);
     sendProgress = new progressMailSend();
     sendProgress->show();
     sendProgress->setMaxMails(mailsToSend.count());
 
     while (mailsToSend.count()>0) {
         if (sendQueuedMail(wrap,smtp,mailsToSend.at(0))==0) {
             QMessageBox::critical(0,tr("Error sending mail"),
                 tr("Error sending queued mail - breaking"));
             returnValue = false;
             break;
         }
         mailsToRemove.append(mailsToSend.at(0));
         mailsToSend.removeFirst();
         sendProgress->setCurrentMails(mailsToRemove.count());
     }
     sendProgress->hide();
     delete sendProgress;
     sendProgress = 0;
     wrap->deleteMails(mbox,mailsToRemove);
     mailsToSend.setAutoDelete(true);
     delete wrap;
     return returnValue;
 }
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h
index f734fa4..0535983 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h
@@ -1,62 +1,61 @@
 #ifndef SMTPwrapper_H
 #define SMTPwrapper_H
 
 #include <qpe/applnk.h>
 
 #include <qbitarray.h>
 #include <qdatetime.h>
 #include <libetpan/clist.h>
 
 #include "settings.h"
 
 class Mail;
 class MBOXwrapper;
 class RecMail;
 class Attachment;
 struct mailimf_fields;
 struct mailimf_field;
 struct mailimf_mailbox;
 struct mailmime;
 struct mailimf_address_list;
 class progressMailSend;
 
 class SMTPwrapper : public QObject
 {
     Q_OBJECT
 
 public:
     SMTPwrapper( Settings *s ); 
     virtual ~SMTPwrapper(){}
-    void sendMail(const Mail& mail,bool later=false );
+    void sendMail(const Mail& mail,SMTPaccount*smtp,bool later=false );
     bool flushOutbox(SMTPaccount*smtp);
 
     static progressMailSend*sendProgress;
 protected:
     mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
     mailimf_fields *createImfFields(const Mail &mail );
     mailmime *createMimeMail(const Mail&mail );
     
     mailimf_address_list *parseAddresses(const QString&addr );
     void addFileParts( mailmime *message,const QList<Attachment>&files );
     mailmime *buildTxtPart(const QString&str );
     mailmime *buildFilePart(const QString&filename,const QString&mimetype,const QString&content);
     void smtpSend( mailmime *mail,bool later, SMTPaccount *smtp );
     clist *createRcptList( mailimf_fields *fields );
-    SMTPaccount *getAccount(const QString&from );
     
     static void storeMail(char*mail, size_t length, const QString&box);
     static QString mailsmtpError( int err );
     static void progress( size_t current, size_t maximum );
     static void addRcpts( clist *list, mailimf_address_list *addr_list );
     static char *getFrom( mailmime *mail );
     static char *getFrom( mailimf_field *ffrom);
     static mailimf_field *getField( mailimf_fields *fields, int type );
     int smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp );
 
     void storeMail(mailmime*mail, const QString&box);
     Settings *settings;
     
     int sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which);
 };
 
 #endif
diff --git a/noncore/net/mail/settings.cpp b/noncore/net/mail/settings.cpp
index b580954..17aa1b0 100644
--- a/noncore/net/mail/settings.cpp
+++ b/noncore/net/mail/settings.cpp
@@ -84,345 +84,320 @@ void Settings::saveAccounts()
 }
 
 void Settings::readAccounts()
 {
     checkDirectory(); 
     Account *it;
 
     for ( it = accounts.first(); it; it = accounts.next() ) {
         it->read();
     }
 }
 
 Account::Account()
 {
     accountName = "changeMe";
     type = "changeMe";
     ssl = false;
 }
 
 void Account::remove()
 {
     QFile file( getFileName() );
     file.remove();
 }
 
 IMAPaccount::IMAPaccount()
     : Account()
 {
     file = IMAPaccount::getUniqueFileName();
     accountName = "New IMAP Account";
     ssl = false;
     type = "IMAP";
     port = IMAP_PORT;
 }
 
 IMAPaccount::IMAPaccount( QString filename )
     : Account()
 {
     file = filename;
     accountName = "New IMAP Account";
     ssl = false;
     type = "IMAP";
     port = IMAP_PORT;
 }
 
 QString IMAPaccount::getUniqueFileName()
 {
     int num = 0;
     QString unique;
     
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
     QStringList imap = dir.entryList( "imap-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "imap-" + unique ) > 0 );
 
     return unique;
 }
 
 void IMAPaccount::read()
 {
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "IMAP Account" );
     accountName = conf->readEntry( "Account","" );
     if (accountName.isNull()) accountName = "";
     server = conf->readEntry( "Server","" );
     if (server.isNull()) server="";
     port = conf->readEntry( "Port","" );
     if (port.isNull()) port="143";
     ssl = conf->readBoolEntry( "SSL",false );
     user = conf->readEntry( "User","" );
     if (user.isNull()) user = "";
     password = conf->readEntryCrypt( "Password","" );
     if (password.isNull()) password = "";
     prefix = conf->readEntry("MailPrefix","");
     if (prefix.isNull()) prefix = "";
 }
 
 void IMAPaccount::save()
 {
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
     
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "IMAP Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->writeEntry( "MailPrefix",prefix);
     conf->write();
 }
 
 
 QString IMAPaccount::getFileName()
 {
     return (QString) getenv( "HOME" ) + "/Applications/opiemail/imap-" + file;
 }
 
 POP3account::POP3account()
     : Account()
 {
     file = POP3account::getUniqueFileName();
     accountName = "New POP3 Account";
     ssl = false;
     type = "POP3";
     port = POP3_PORT;
 }
 
 POP3account::POP3account( QString filename )
     : Account()
 {
     file = filename;
     accountName = "New POP3 Account";
     ssl = false;
     type = "POP3";
     port = POP3_PORT;
 }
 
 QString POP3account::getUniqueFileName()
 {
     int num = 0;
     QString unique;
     
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
     QStringList imap = dir.entryList( "pop3-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "pop3-" + unique ) > 0 );
 
     return unique;
 }
 
 void POP3account::read()
 {
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "POP3 Account" );
     accountName = conf->readEntry( "Account" );
     server = conf->readEntry( "Server" );
     port = conf->readEntry( "Port" );
     ssl = conf->readBoolEntry( "SSL" );
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
 }
 
 void POP3account::save()
 {
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
     
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "POP3 Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->write();
 }
 
 
 QString POP3account::getFileName()
 {
     return (QString) getenv( "HOME" ) + "/Applications/opiemail/pop3-" + file;
 }
 
 SMTPaccount::SMTPaccount()
     : Account()
 {
     file = SMTPaccount::getUniqueFileName();
     accountName = "New SMTP Account";
     ssl = false;
     login = false;
     useCC = false;
     useBCC = false;
     useReply = false;
     type = "SMTP";
     port = SMTP_PORT;
 }
 
 SMTPaccount::SMTPaccount( QString filename )
     : Account()
 {
     file = filename;
     accountName = "New SMTP Account";
     ssl = false;
     login = false;
-    useCC = false;
-    useBCC = false;
-    useReply = false;
     type = "SMTP";
     port = SMTP_PORT;
 }
 
 QString SMTPaccount::getUniqueFileName()
 {
     int num = 0;
     QString unique;
     
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
     QStringList imap = dir.entryList( "smtp-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "smtp-" + unique ) > 0 );
 
     return unique;
 }
 
 void SMTPaccount::read()
 {
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "SMTP Account" );
     accountName = conf->readEntry( "Account" );
     server = conf->readEntry( "Server" );
     port = conf->readEntry( "Port" );
     ssl = conf->readBoolEntry( "SSL" );
     login = conf->readBoolEntry( "Login" );
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
-    useCC = conf->readBoolEntry( "useCC" );
-    useBCC = conf->readBoolEntry( "useBCC" );
-    useReply = conf->readBoolEntry( "useReply" );
-    name = conf->readEntry( "Name" );
-    mail = conf->readEntry( "Mail" );
-    org = conf->readEntry( "Org" );
-    cc = conf->readEntry( "CC" );
-    bcc = conf->readEntry( "BCC" );
-    reply = conf->readEntry( "Reply" );
-    signature = conf->readEntry( "Signature" );
-    signature = signature.replace( QRegExp( "<br>" ), "\n" );
 }
 
 void SMTPaccount::save()
 {
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
     
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "SMTP Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "Login", login );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
-    conf->writeEntry( "useCC", useCC );
-    conf->writeEntry( "useBCC", useBCC );
-    conf->writeEntry( "useReply", useReply );
-    conf->writeEntry( "Name", name );
-    conf->writeEntry( "Mail", mail );
-    conf->writeEntry( "Org", org );
-    conf->writeEntry( "CC", cc );
-    conf->writeEntry( "BCC", bcc );
-    conf->writeEntry( "Reply", reply );
-    conf->writeEntry( "Signature", 
-                      signature.replace( QRegExp( "\\n" ), "<br>" ) );
     conf->write();
 }
 
 
 QString SMTPaccount::getFileName()
 {
     return (QString) getenv( "HOME" ) + "/Applications/opiemail/smtp-" + file;
 }
 
 NNTPaccount::NNTPaccount()
     : Account()
 {
     file = NNTPaccount::getUniqueFileName();
     accountName = "New NNTP Account";
     ssl = false;
     login = false;
     type = "NNTP";
     port = NNTP_PORT;
 }
 
 NNTPaccount::NNTPaccount( QString filename )
     : Account()
 {
     file = filename;
     accountName = "New NNTP Account";
     ssl = false;
     login = false;
     type = "NNTP";
     port = NNTP_PORT;
 }
 
 QString NNTPaccount::getUniqueFileName()
 {
     int num = 0;
     QString unique;
     
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
     QStringList imap = dir.entryList( "nntp-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "nntp-" + unique ) > 0 );
 
     return unique;
 }
 
 void NNTPaccount::read()
 {
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "NNTP Account" );
     accountName = conf->readEntry( "Account" );
     server = conf->readEntry( "Server" );
     port = conf->readEntry( "Port" );
     ssl = conf->readBoolEntry( "SSL" );
     login = conf->readBoolEntry( "Login" );
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
 }
 
 void NNTPaccount::save()
 {
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
     
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "NNTP Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "Login", login );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->write();
 }
 
 
 QString NNTPaccount::getFileName()
 {
     return (QString) getenv( "HOME" ) + "/Applications/opiemail/nntp-" + file;
 }
 
diff --git a/noncore/net/mail/settings.h b/noncore/net/mail/settings.h
index 22184a5..caa5dfc 100644
--- a/noncore/net/mail/settings.h
+++ b/noncore/net/mail/settings.h
@@ -1,166 +1,146 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
 #include <qobject.h>
 #include <qlist.h>
 
 class Account 
 {
     
 public:
     Account();
     virtual ~Account() {}
 
     void remove();
     void setAccountName( QString name ) { accountName = name; }
     const QString&getAccountName()const{ return accountName; }
     const QString&getType()const{ return type; }
     
     void setServer(const QString&str){ server = str; }
     const QString&getServer()const{ return server; }
     
     void setPort(const QString&str) { port = str; }
     const QString&getPort()const{ return port; }
     
     void setUser(const QString&str){ user = str; }
     const QString&getUser()const{ return user; }
     
     void setPassword(const QString&str) { password = str; }
     const QString&getPassword()const { return password; }
     
     void setSSL( bool b ) { ssl = b; }
     bool getSSL() { return ssl; }
 
     virtual QString getFileName() { return accountName; }
     virtual void read() { qDebug( "base reading..." ); }
     virtual void save() { qDebug( "base saving..." ); }
 
 protected:
     QString accountName, type, server, port, user, password;
     bool ssl;
     
 };
 
 class IMAPaccount : public Account
 {
         
 public:
     IMAPaccount();
     IMAPaccount( QString filename );
 
     static QString getUniqueFileName();
 
     virtual void read();
     virtual void save();
     virtual QString getFileName();
 
     void setPrefix(const QString&str) {prefix=str;}
     const QString&getPrefix()const{return prefix;}
 
 private:
     QString file,prefix;
 
 };
 
 class POP3account : public Account
 {
         
 public:
     POP3account();
     POP3account( QString filename );
 
     static QString getUniqueFileName();
 
     virtual void read();
     virtual void save();
     virtual QString getFileName();
 
 private:
     QString file;
     
 };
 
 class SMTPaccount : public Account
 {
     
 public:
     SMTPaccount();
     SMTPaccount( QString filename );
 
     static QString getUniqueFileName();
 
     virtual void read();
     virtual void save();
     virtual QString getFileName();
 
-    void setName( QString str ) { name = str; }
-    QString getName() { return name; }
-    void setMail( QString str ) { mail = str; }
-    QString getMail() { return mail; }
-    void setOrg( QString str ) { org = str; }
-    QString getOrg() { return org; }
-    void setUseCC( bool b ) { useCC = b; }
-    bool getUseCC() { return useCC; }
-    void setCC( QString str ) { cc = str; }
-    QString getCC() { return cc; }
-    void setUseBCC( bool b ) { useBCC = b; }
-    bool getUseBCC() { return useBCC; }
-    void setBCC( QString str ) { bcc = str; }
-    QString getBCC() { return bcc; }
-    void setUseReply( bool b ) { useReply = b; }
-    bool getUseReply() { return useReply; }
-    void setReply( QString str ) { reply = str; }
-    QString getReply() { return reply; }
-    void setSignature( QString str ) { signature = str; }
-    QString getSignature() { return signature; }
     void setLogin( bool b ) { login = b; }
     bool getLogin() { return login; }
 
 private:
     QString file, name, mail, org, cc, bcc, reply, signature;
     bool useCC, useBCC, useReply, login;
 
 };
 
 class NNTPaccount : public Account
 {
         
 public:
     NNTPaccount();
     NNTPaccount( QString filename );
 
     static QString getUniqueFileName();
 
     virtual void read();
     virtual void save();
     virtual QString getFileName();
 
     void setLogin( bool b ) { login = b; }
     bool getLogin() { return login; }
 
 private:
     QString file;
     bool login;
 
 };
 
 class Settings : public QObject
 {
     Q_OBJECT
 
 public:
     Settings();
     QList<Account> getAccounts();
     void addAccount(Account *account);
     void delAccount(Account *account);
     void saveAccounts();
     void readAccounts();
     static void checkDirectory();
 
 private:
     void updateAccounts();
     QList<Account> accounts;
         
 };
 
 #endif
diff --git a/noncore/net/mail/smtpconfigui.ui b/noncore/net/mail/smtpconfigui.ui
index 2cae8d6..f5ce8cb 100644
--- a/noncore/net/mail/smtpconfigui.ui
+++ b/noncore/net/mail/smtpconfigui.ui
@@ -1,500 +1,261 @@
 <!DOCTYPE UI><UI>
 <class>SMTPconfigUI</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>SMTPconfigUI</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>253</width>
-            <height>342</height>
+            <width>241</width>
+            <height>321</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Configure SMTP</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
-            <number>0</number>
+            <number>2</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>0</number>
+            <number>2</number>
         </property>
         <widget>
-            <class>QTabWidget</class>
+            <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>smtpTab</cstring>
-            </property>
-            <property stdset="1">
-                <name>caption</name>
-                <string></string>
-            </property>
-            <property>
-                <name>layoutMargin</name>
+                <cstring>Layout4</cstring>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>serverTab</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Server</string>
-                </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>4</number>
+                    <number>0</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
-                        <number>3</number>
+                    <number>2</number>
                     </property>
-                    <widget row="3"  column="0" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>portLabel</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Port</string>
-                        </property>
-                    </widget>
-                    <widget row="2"  column="1"  rowspan="1"  colspan="2" >
-                        <class>QLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>serverLine</cstring>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Name of the SMTP Server</string>
-                        </property>
-                    </widget>
-                    <widget row="2"  column="0" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>serverLabel</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Server</string>
-                        </property>
-                    </widget>
-                    <widget row="3"  column="1"  rowspan="1"  colspan="2" >
-                        <class>QLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>portLine</cstring>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Port of the SMTP Server</string>
-                        </property>
-                    </widget>
-                    <widget row="0"  column="0" >
+                <widget row="0"  column="0"  rowspan="1"  colspan="2" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>accountLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Account</string>
                         </property>
                     </widget>
-                    <widget row="0"  column="1"  rowspan="1"  colspan="2" >
-                        <class>QLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>accountLine</cstring>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Name of the Account</string>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="0"  rowspan="1"  colspan="3" >
-                        <class>Line</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>line1</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
-                        </property>
-                    </widget>
-                    <widget row="4"  column="1" >
-                        <class>QCheckBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>sslBox</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Use SSL</string>
-                        </property>
-                    </widget>
-                    <widget row="5"  column="0"  rowspan="1"  colspan="3" >
-                        <class>Line</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>line2</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
-                        </property>
-                    </widget>
-                    <widget row="8"  column="1"  rowspan="1"  colspan="2" >
+                <widget row="8"  column="2" >
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>passLine</cstring>
                         </property>
                         <property stdset="1">
                             <name>enabled</name>
                             <bool>false</bool>
                         </property>
                         <property stdset="1">
                             <name>echoMode</name>
                             <enum>Password</enum>
                         </property>
                     </widget>
-                    <widget row="6"  column="1"  rowspan="1"  colspan="2" >
+                <widget row="4"  column="0"  rowspan="1"  colspan="3" >
                         <class>QCheckBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>loginBox</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Use Login</string>
-                        </property>
-                    </widget>
-                    <widget row="8"  column="0" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>passLabel</cstring>
+                        <cstring>sslBox</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>Password</string>
+                        <string>Use SSL</string>
                         </property>
                     </widget>
-                    <widget row="7"  column="0" >
-                        <class>QLabel</class>
+                <widget row="6"  column="0"  rowspan="1"  colspan="3" >
+                    <class>QCheckBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>userLabel</cstring>
+                        <cstring>loginBox</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>User</string>
+                        <string>Use Login</string>
                         </property>
                     </widget>
-                    <widget row="7"  column="1"  rowspan="1"  colspan="2" >
+                <widget row="0"  column="2" >
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>userLine</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>enabled</name>
-                            <bool>false</bool>
-                        </property>
-                    </widget>
-                    <spacer row="9"  column="2" >
-                        <property>
-                            <name>name</name>
-                            <cstring>spacer</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Vertical</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
-            </widget>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>identityTab</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Identity</string>
-                </attribute>
-                <grid>
-                    <property stdset="1">
-                        <name>margin</name>
-                        <number>4</number>
-                    </property>
-                    <property stdset="1">
-                        <name>spacing</name>
-                        <number>3</number>
-                    </property>
-                    <widget row="9"  column="0"  rowspan="1"  colspan="4" >
-                        <class>QMultiLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>sigMultiLine</cstring>
-                        </property>
-                    </widget>
-                    <spacer row="10"  column="3" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer3</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Vertical</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
+                        <cstring>accountLine</cstring>
                         </property>
                         <property>
                             <name>toolTip</name>
                             <string>Name of the Account</string>
                         </property>
-                    </spacer>
-                    <widget row="8"  column="0"  rowspan="1"  colspan="3" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>sigLabel</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Signature</string>
-                        </property>
-                    </widget>
-                    <widget row="6"  column="2"  rowspan="1"  colspan="2" >
-                        <class>QLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>replyLine</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>enabled</name>
-                            <bool>false</bool>
-                        </property>
                     </widget>
-                    <widget row="5"  column="2"  rowspan="1"  colspan="2" >
+                <widget row="2"  column="1"  rowspan="1"  colspan="2" >
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>bccLine</cstring>
+                        <cstring>serverLine</cstring>
                         </property>
-                        <property stdset="1">
-                            <name>enabled</name>
-                            <bool>false</bool>
+                    <property>
+                        <name>toolTip</name>
+                        <string>Name of the SMTP Server</string>
                         </property>
                     </widget>
-                    <widget row="4"  column="2"  rowspan="1"  colspan="2" >
+                <widget row="7"  column="2" >
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>ccLine</cstring>
+                        <cstring>userLine</cstring>
                         </property>
                         <property stdset="1">
                             <name>enabled</name>
                             <bool>false</bool>
                         </property>
                     </widget>
-                    <widget row="5"  column="0"  rowspan="1"  colspan="2" >
-                        <class>QCheckBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>bccBox</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>BCC</string>
-                        </property>
-                    </widget>
-                    <widget row="6"  column="0"  rowspan="1"  colspan="2" >
-                        <class>QCheckBox</class>
+                <widget row="8"  column="0"  rowspan="1"  colspan="2" >
+                    <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>replyBox</cstring>
+                        <cstring>passLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>Reply-To</string>
+                        <string>Password</string>
                         </property>
                     </widget>
-                    <widget row="4"  column="0"  rowspan="1"  colspan="2" >
-                        <class>QCheckBox</class>
+                <widget row="3"  column="0" >
+                    <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>ccBox</cstring>
+                        <cstring>portLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>CC</string>
+                        <string>Port</string>
                         </property>
                     </widget>
-                    <widget row="1"  column="0" >
+                <widget row="2"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>mailLabel</cstring>
+                        <cstring>serverLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>E-Mail</string>
+                        <string>Server</string>
                         </property>
                     </widget>
-                    <widget row="0"  column="1"  rowspan="1"  colspan="3" >
+                <widget row="3"  column="1"  rowspan="1"  colspan="2" >
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>nameLine</cstring>
+                        <cstring>portLine</cstring>
                         </property>
                         <property>
                             <name>toolTip</name>
-                            <string>Your Full Name</string>
+                        <string>Port of the SMTP Server</string>
                         </property>
                     </widget>
-                    <widget row="0"  column="0" >
-                        <class>QLabel</class>
+                <widget row="1"  column="0"  rowspan="1"  colspan="3" >
+                    <class>Line</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>nameLabel</cstring>
+                        <cstring>line1</cstring>
                         </property>
                         <property stdset="1">
-                            <name>text</name>
-                            <string>Name</string>
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>3</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
                         </property>
                     </widget>
-                    <widget row="2"  column="0" >
+                <widget row="7"  column="0"  rowspan="1"  colspan="2" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>orgLabel</cstring>
+                        <cstring>userLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>Org.</string>
-                        </property>
-                        <property>
-                            <name>layoutMargin</name>
-                        </property>
-                        <property>
-                            <name>layoutSpacing</name>
-                        </property>
-                    </widget>
-                    <widget row="2"  column="1"  rowspan="1"  colspan="3" >
-                        <class>QLineEdit</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>orgLine</cstring>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Your Organisation</string>
+                        <string>User</string>
                         </property>
                     </widget>
-                    <widget row="1"  column="1"  rowspan="1"  colspan="3" >
-                        <class>QLineEdit</class>
+                <widget row="5"  column="0"  rowspan="1"  colspan="3" >
+                    <class>Line</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>mailLine</cstring>
-                        </property>
-                        <property>
-                            <name>toolTip</name>
-                            <string>Your E-Mail Adress</string>
+                        <cstring>line2</cstring>
                         </property>
-                    </widget>
-                    <widget row="3"  column="0"  rowspan="1"  colspan="4" >
-                        <class>Line</class>
                         <property stdset="1">
-                            <name>name</name>
-                            <cstring>line3</cstring>
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>3</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
                             <enum>Horizontal</enum>
                         </property>
                     </widget>
-                    <widget row="7"  column="0"  rowspan="1"  colspan="4" >
-                        <class>Line</class>
-                        <property stdset="1">
+            </grid>
+        </widget>
+        <spacer>
+            <property>
                             <name>name</name>
-                            <cstring>line4</cstring>
+                <cstring>spacer</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
-                            <enum>Horizontal</enum>
+                <enum>Vertical</enum>
                         </property>
-                    </widget>
-                </grid>
-            </widget>
-        </widget>
+            <property stdset="1">
+                <name>sizeType</name>
+                <enum>Expanding</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
     </vbox>
 </widget>
 <tabstops>
     <tabstop>accountLine</tabstop>
     <tabstop>serverLine</tabstop>
     <tabstop>portLine</tabstop>
     <tabstop>sslBox</tabstop>
     <tabstop>loginBox</tabstop>
     <tabstop>userLine</tabstop>
     <tabstop>passLine</tabstop>
-    <tabstop>smtpTab</tabstop>
-    <tabstop>nameLine</tabstop>
-    <tabstop>mailLine</tabstop>
-    <tabstop>orgLine</tabstop>
-    <tabstop>ccBox</tabstop>
-    <tabstop>ccLine</tabstop>
-    <tabstop>bccBox</tabstop>
-    <tabstop>bccLine</tabstop>
-    <tabstop>replyBox</tabstop>
-    <tabstop>replyLine</tabstop>
-    <tabstop>sigMultiLine</tabstop>
 </tabstops>
 </UI>
diff --git a/noncore/net/mail/smtpwrapper.cpp b/noncore/net/mail/smtpwrapper.cpp
index 521cd0a..30c0707 100644
--- a/noncore/net/mail/smtpwrapper.cpp
+++ b/noncore/net/mail/smtpwrapper.cpp
@@ -1,726 +1,710 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <qdir.h>
 #include <qt.h>
 
 #include <libetpan/libetpan.h>
 
 #include "smtpwrapper.h"
 #include "mailwrapper.h"
 #include "mboxwrapper.h"
 #include "logindialog.h"
 #include "mailtypes.h"
 #include "defines.h"
 #include "sendmailprogress.h"
 
 progressMailSend*SMTPwrapper::sendProgress = 0;
 
 SMTPwrapper::SMTPwrapper( Settings *s )
     : QObject()
 {
     settings = s;
 }
 
 QString SMTPwrapper::mailsmtpError( int errnum )
 {
     switch ( errnum ) {
         case MAILSMTP_NO_ERROR:
             return tr( "No error" );
         case MAILSMTP_ERROR_UNEXPECTED_CODE:
             return tr( "Unexpected error code" );
         case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE:
             return tr( "Service not available" );
         case MAILSMTP_ERROR_STREAM:
             return tr( "Stream error" );
         case MAILSMTP_ERROR_HOSTNAME:
             return tr( "gethostname() failed" );
         case MAILSMTP_ERROR_NOT_IMPLEMENTED:
             return tr( "Not implemented" );
         case MAILSMTP_ERROR_ACTION_NOT_TAKEN:
             return tr( "Error, action not taken" );
         case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION:
             return tr( "Data exceeds storage allocation" );
         case MAILSMTP_ERROR_IN_PROCESSING:
             return tr( "Error in processing" );
   //      case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE:
     //        return tr( "Insufficient system storage" );
         case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE:
             return tr( "Mailbox unavailable" );
         case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED:
             return tr( "Mailbox name not allowed" );
         case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND:
             return tr( "Bad command sequence" );
         case MAILSMTP_ERROR_USER_NOT_LOCAL:
             return tr( "User not local" );
         case MAILSMTP_ERROR_TRANSACTION_FAILED:
             return tr( "Transaction failed" );
         case MAILSMTP_ERROR_MEMORY:
             return tr( "Memory error" );
         case MAILSMTP_ERROR_CONNECTION_REFUSED:
             return tr( "Connection refused" );
         default:
             return tr( "Unknown error code" );
     }
 }
 
 mailimf_mailbox *SMTPwrapper::newMailbox(const QString&name, const QString&mail )
 {
     return mailimf_mailbox_new( strdup( name.latin1() ),
                                 strdup( mail.latin1() ) );
 }
 
 mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr )
 {
     mailimf_address_list *addresses;
 
     if ( addr.isEmpty() ) return NULL;
 
     addresses = mailimf_address_list_new_empty();
 
     bool literal_open = false;
     unsigned int startpos = 0;
     QStringList list;
     QString s;
     unsigned int i = 0;
     for (; i < addr.length();++i) {
         switch (addr[i]) {
         case '\"':
             literal_open = !literal_open;
             break;
         case ',':
             if (!literal_open) {
                 s = addr.mid(startpos,i-startpos);
                 if (!s.isEmpty()) {
                     list.append(s);
                     qDebug("Appended %s",s.latin1());
                 }
                 // !!!! this is a MUST BE!
                 startpos = ++i;
             }
             break;
         default:
             break;
         }
     }
     s = addr.mid(startpos,i-startpos);
     if (!s.isEmpty()) {
        list.append(s);
        qDebug("Appended %s",s.latin1());
     }
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); it++ ) {
         int err = mailimf_address_list_add_parse( addresses, (char*)(*it).latin1() );
         if ( err != MAILIMF_NO_ERROR ) {
             qDebug( "Error parsing" );
             qDebug( *it );
         } else {
             qDebug( "Parse success! %s",(*it).latin1());
         }
     }
     return addresses;
 }
 
 mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail )
 {
     mailimf_fields *fields;
     mailimf_field *xmailer;
-    mailimf_mailbox *sender, *fromBox;
-    mailimf_mailbox_list *from;
-    mailimf_address_list *to, *cc, *bcc, *reply;
+    mailimf_mailbox *sender=0,*fromBox=0;
+    mailimf_mailbox_list *from=0;
+    mailimf_address_list *to=0, *cc=0, *bcc=0, *reply=0;
     char *subject = strdup( mail.getSubject().latin1() );
     int err;
 
     sender = newMailbox( mail.getName(), mail.getMail() );
     if ( sender == NULL ) goto err_free;
 
     fromBox = newMailbox( mail.getName(), mail.getMail() );
     if ( fromBox == NULL ) goto err_free_sender;
 
     from = mailimf_mailbox_list_new_empty();
     if ( from == NULL ) goto err_free_fromBox;
 
     err = mailimf_mailbox_list_add( from, fromBox );
     if ( err != MAILIMF_NO_ERROR ) goto err_free_from;
 
     to = parseAddresses( mail.getTo() );
     if ( to == NULL ) goto err_free_from;
 
     cc = parseAddresses( mail.getCC() );
     bcc = parseAddresses( mail.getBCC() );
     reply = parseAddresses( mail.getReply() );
 
     fields = mailimf_fields_new_with_data( from, sender, reply, to, cc, bcc,
                                            NULL, NULL, subject );
     if ( fields == NULL ) goto err_free_reply;
 
     xmailer = mailimf_field_new_custom( strdup( "User-Agent" ),
                                         strdup( USER_AGENT ) );
     if ( xmailer == NULL ) goto err_free_fields;
 
     err = mailimf_fields_add( fields, xmailer );
     if ( err != MAILIMF_NO_ERROR ) goto err_free_xmailer;
 
     return fields;      // Success :)
 
 err_free_xmailer:
-    mailimf_field_free( xmailer );
+    if (xmailer) mailimf_field_free( xmailer );
 err_free_fields:
-    mailimf_fields_free( fields );
+    if (fields) mailimf_fields_free( fields );
 err_free_reply:
-    mailimf_address_list_free( reply );
-    mailimf_address_list_free( bcc );
-    mailimf_address_list_free( cc );
-    mailimf_address_list_free( to );
+    if (reply) mailimf_address_list_free( reply );
+    if (bcc) mailimf_address_list_free( bcc );
+    if (cc) mailimf_address_list_free( cc );
+    if (to) mailimf_address_list_free( to );
 err_free_from:
-    mailimf_mailbox_list_free( from );
+    if (from) mailimf_mailbox_list_free( from );
 err_free_fromBox:
     mailimf_mailbox_free( fromBox );
 err_free_sender:
-    mailimf_mailbox_free( sender );
+    if (sender) mailimf_mailbox_free( sender );
 err_free:
-    free( subject );
+    if (subject) free( subject );
     qDebug( "createImfFields - error" );
 
     return NULL;        // Error :(
 }
 
 mailmime *SMTPwrapper::buildTxtPart(const QString&str )
 {
     mailmime *txtPart;
     mailmime_fields *fields;
     mailmime_content *content;
     mailmime_parameter *param;
     int err;
 
     param = mailmime_parameter_new( strdup( "charset" ),
                                     strdup( "iso-8859-1" ) );
     if ( param == NULL ) goto err_free;
 
     content = mailmime_content_new_with_str( "text/plain" );
     if ( content == NULL ) goto err_free_param;
 
     err = clist_append( content->ct_parameters, param );
     if ( err != MAILIMF_NO_ERROR ) goto err_free_content;
 
-    fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_QUOTED_PRINTABLE);
+    fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_8BIT);
     if ( fields == NULL ) goto err_free_content;
 
     txtPart = mailmime_new_empty( content, fields );
     if ( txtPart == NULL ) goto err_free_fields;
 
     err = mailmime_set_body_text( txtPart, (char*)str.data(), str.length() );
     if ( err != MAILIMF_NO_ERROR ) goto err_free_txtPart;
 
     return txtPart;     // Success :)
 
 err_free_txtPart:
     mailmime_free( txtPart );
 err_free_fields:
     mailmime_fields_free( fields );
 err_free_content:
     mailmime_content_free( content );
 err_free_param:
     mailmime_parameter_free( param );
 err_free:
     qDebug( "buildTxtPart - error" );
 
     return NULL;        // Error :(
 }
 
 mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimetype,const QString&TextContent )
 {
     mailmime * filePart = 0;
     mailmime_fields * fields = 0;
     mailmime_content * content = 0;
     mailmime_parameter * param = 0;
     char*name = 0;
     char*file = 0;
     int err;
 
     int pos = filename.findRev( '/' );
 
     if (filename.length()>0) {
         QString tmp = filename.right( filename.length() - ( pos + 1 ) );
         name = strdup( tmp.latin1() );        // just filename
         file = strdup( filename.latin1() );   // full name with path
     }
     
     int disptype = MAILMIME_DISPOSITION_TYPE_ATTACHMENT;
     int mechanism = MAILMIME_MECHANISM_BASE64;
 
     if ( mimetype.startsWith( "text/" ) ) {
         param = mailmime_parameter_new( strdup( "charset" ),
                                         strdup( "iso-8859-1" ) );
         mechanism = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
     }
 
     fields = mailmime_fields_new_filename(
                 disptype, name,
                 mechanism );
     content = mailmime_content_new_with_str( (char*)mimetype.latin1() );
     if (content!=0 && fields != 0) {
         if (param) {
             clist_append(content->ct_parameters,param);
             param = 0;
         }
         if (filename.length()>0) {
             QFileInfo f(filename);
             param = mailmime_parameter_new(strdup("name"),strdup(f.fileName().latin1()));
             clist_append(content->ct_parameters,param);
             param = 0;
         }
         filePart = mailmime_new_empty( content, fields );
     }
     if (filePart) {
         if (filename.length()>0) {
             err = mailmime_set_body_file( filePart, file );
         } else {
             err = mailmime_set_body_text(filePart,strdup(TextContent.data()),TextContent.length());
         }
         if (err != MAILIMF_NO_ERROR) {
             qDebug("Error setting body with file %s",file);
             mailmime_free( filePart );
             filePart = 0;
         }
     }
 
     if (!filePart) {
         if ( param != NULL ) {
             mailmime_parameter_free( param );
         }
         if (content) {
             mailmime_content_free( content );
         }
         if (fields) {
             mailmime_fields_free( fields );
         } else {
             if (name) {
                 free( name );
             }
             if (file) {
                 free( file );
             }
         }
     }
     return filePart;        // Success :)
 
 }
 
 void SMTPwrapper::addFileParts( mailmime *message,const QList<Attachment>&files )
 {
     const Attachment *it;
     unsigned int count = files.count();
     qDebug("List contains %i values",count);
     for ( unsigned int i = 0; i < count; ++i ) {
         qDebug( "Adding file" );
         mailmime *filePart;
         int err;
         it = ((QList<Attachment>)files).at(i);
 
         filePart = buildFilePart( it->getFileName(), it->getMimeType(),"" );
         if ( filePart == NULL ) {
             qDebug( "addFileParts: error adding file:" );
             qDebug( it->getFileName() );
             continue;
         }
         err = mailmime_smart_add_part( message, filePart );
         if ( err != MAILIMF_NO_ERROR ) {
             mailmime_free( filePart );
             qDebug("error smart add");
         }
     }
 }
 
 mailmime *SMTPwrapper::createMimeMail(const Mail &mail )
 {
     mailmime *message, *txtPart;
     mailimf_fields *fields;
     int err;
 
     fields = createImfFields( mail );
     if ( fields == NULL ) goto err_free;
 
     message = mailmime_new_message_data( NULL );
     if ( message == NULL ) goto err_free_fields;
 
     mailmime_set_imf_fields( message, fields );
 
     txtPart = buildTxtPart( mail.getMessage() );
     
     if ( txtPart == NULL ) goto err_free_message;
 
     err = mailmime_smart_add_part( message, txtPart );
     if ( err != MAILIMF_NO_ERROR ) goto err_free_txtPart;
 
     addFileParts( message, mail.getAttachments() );
 
     return message;         // Success :)
 
 err_free_txtPart:
     mailmime_free( txtPart );
 err_free_message:
     mailmime_free( message );
 err_free_fields:
     mailimf_fields_free( fields );
 err_free:
     qDebug( "createMimeMail: error" );
 
     return NULL;            // Error :(
 }
 
 mailimf_field *SMTPwrapper::getField( mailimf_fields *fields, int type )
 {
     mailimf_field *field;
     clistiter *it;
 
     it = clist_begin( fields->fld_list );
     while ( it ) {
         field = (mailimf_field *) it->data;
         if ( field->fld_type == type ) {
             return field;
         }
         it = it->next;
     }
 
     return NULL;
 }
 
 void SMTPwrapper::addRcpts( clist *list, mailimf_address_list *addr_list )
 {
     clistiter *it, *it2;
 
     for ( it = clist_begin( addr_list->ad_list ); it; it = it->next ) {
         mailimf_address *addr;
         addr = (mailimf_address *) it->data;
 
         if ( addr->ad_type == MAILIMF_ADDRESS_MAILBOX ) {
     	    esmtp_address_list_add( list, addr->ad_data.ad_mailbox->mb_addr_spec, 0, NULL );
         } else if ( addr->ad_type == MAILIMF_ADDRESS_GROUP ) {
             clist *l = addr->ad_data.ad_group->grp_mb_list->mb_list;
     	    for ( it2 = clist_begin( l ); it2; it2 = it2->next ) {
                 mailimf_mailbox *mbox;
     	        mbox = (mailimf_mailbox *) it2->data;
 	            esmtp_address_list_add( list, mbox->mb_addr_spec, 0, NULL );
 	        }
 	    }
     }
 }
 
 clist *SMTPwrapper::createRcptList( mailimf_fields *fields )
 {
     clist *rcptList;
     mailimf_field *field;
 
     rcptList = esmtp_address_list_new();
 
     field = getField( fields, MAILIMF_FIELD_TO );
     if ( field && (field->fld_type == MAILIMF_FIELD_TO)
          && field->fld_data.fld_to->to_addr_list ) {
         addRcpts( rcptList, field->fld_data.fld_to->to_addr_list );
     }
 
     field = getField( fields, MAILIMF_FIELD_CC );
     if ( field && (field->fld_type == MAILIMF_FIELD_CC)
          && field->fld_data.fld_cc->cc_addr_list ) {
         addRcpts( rcptList, field->fld_data.fld_cc->cc_addr_list );
     }
 
     field = getField( fields, MAILIMF_FIELD_BCC );
     if ( field && (field->fld_type == MAILIMF_FIELD_BCC)
          && field->fld_data.fld_bcc->bcc_addr_list ) {
         addRcpts( rcptList, field->fld_data.fld_bcc->bcc_addr_list );
     }
 
     return rcptList;
 }
 
 char *SMTPwrapper::getFrom( mailimf_field *ffrom)
 {
     char *from = NULL;
     if ( ffrom && (ffrom->fld_type == MAILIMF_FIELD_FROM)
          && ffrom->fld_data.fld_from->frm_mb_list && ffrom->fld_data.fld_from->frm_mb_list->mb_list ) {
         clist *cl = ffrom->fld_data.fld_from->frm_mb_list->mb_list;
         clistiter *it;
         for ( it = clist_begin( cl ); it; it = it->next ) {
             mailimf_mailbox *mb = (mailimf_mailbox *) it->data;
             from = strdup( mb->mb_addr_spec );
         }
     }
 
     return from;
 }
 
 char *SMTPwrapper::getFrom( mailmime *mail )
 {
     /* no need to delete - its just a pointer to structure content */
     mailimf_field *ffrom = 0;
     ffrom = getField( mail->mm_data.mm_message.mm_fields, MAILIMF_FIELD_FROM );
     return getFrom(ffrom);
 }
 
-SMTPaccount *SMTPwrapper::getAccount(const QString&name )
-{
-    SMTPaccount *smtp;
-
-    QList<Account> list = settings->getAccounts();
-    Account *it;
-    for ( it = list.first(); it; it = list.next() ) {
-        if ( it->getType().compare( "SMTP" ) == 0 ) {
-            smtp = static_cast<SMTPaccount *>(it);
-            if ( smtp->getName()== name ) {
-                qDebug( "SMTPaccount found for" );
-                qDebug( name );
-                return smtp;
-            }
-        }
-    }
-
-    return NULL;
-}
-
 void SMTPwrapper::progress( size_t current, size_t maximum )
 {
     if (SMTPwrapper::sendProgress) {
         SMTPwrapper::sendProgress->setSingleMail(current, maximum );
         qApp->processEvents();
     }
 }
 
 void SMTPwrapper::storeMail(char*mail, size_t length, const QString&box)
 {
     if (!mail) return;
     QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
     MBOXwrapper*wrap = new MBOXwrapper(localfolders);
     wrap->storeMessage(mail,length,box);
     delete wrap;
 }
 
 void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
 {
     clist *rcpts = 0;
     char *from, *data;
     size_t size;
 
     if ( smtp == NULL ) {
         return;
     }
     from = data = 0;
     
     mailmessage * msg = 0;
     msg = mime_message_init(mail);
     mime_message_set_tmpdir(msg,getenv( "HOME" ));
     int r = mailmessage_fetch(msg,&data,&size);
     mime_message_detach_mime(msg);
     mailmessage_free(msg);
     if (r != MAIL_NO_ERROR || !data) {
         if (data) free(data);
         qDebug("Error fetching mime...");
         return;
     }
     QString tmp = data;
     tmp.replace(QRegExp("\r+",true,false),"");
     msg = 0;
     if (later) {
         storeMail((char*)tmp.data(),tmp.length(),"Outgoing");
         if (data) free( data );
         return;
     }
     from = getFrom( mail );
     rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );
     smtpSend(from,rcpts,data,size,smtp);
     if (data) {free(data);}
     if (from) {free(from);}
     if (rcpts) smtp_address_list_free( rcpts );
 }
 
 int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp )
 {
     char *server, *user, *pass;
     bool ssl;
     uint16_t port;
     mailsmtp *session;
     int err,result;
 
     result = 1;
     server = user = pass = 0;
     server = strdup( smtp->getServer().latin1() );
     ssl = smtp->getSSL();
     port = smtp->getPort().toUInt();
 
     session = mailsmtp_new( 20, &progress );
     if ( session == NULL ) goto free_mem;
 
     qDebug( "Servername %s at port %i", server, port );
     if ( ssl ) {
         qDebug( "SSL session" );
         err = mailsmtp_ssl_connect( session, server, port );
     } else {
         qDebug( "No SSL session" );
         err = mailsmtp_socket_connect( session, server, port );
     }
     if ( err != MAILSMTP_NO_ERROR ) {result = 0;goto free_mem_session;}
 
     err = mailsmtp_init( session );
     if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;}
 
     qDebug( "INIT OK" );
 
     if ( smtp->getLogin() ) {
         if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
             // get'em
             LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true );
             login.show();
             if ( QDialog::Accepted == login.exec() ) {
                 // ok
                 user = strdup( login.getUser().latin1() );
                 pass = strdup( login.getPassword().latin1() );
             } else {
                 result = 0; goto free_con_session;
             }
         } else {
             user = strdup( smtp->getUser().latin1() );
             pass = strdup( smtp->getPassword().latin1() );
         }
         qDebug( "session->auth: %i", session->auth);
         err = mailsmtp_auth( session, user, pass );
         if ( err == MAILSMTP_NO_ERROR ) qDebug("auth ok");
         qDebug( "Done auth!" );
     }
 
     err = mailsmtp_send( session, from, rcpts, data, size );
     if ( err != MAILSMTP_NO_ERROR ) {
         qDebug("Error sending mail: %s",mailsmtpError(err).latin1());
         result = 0; goto free_con_session;
     }
 
     qDebug( "Mail sent." );
     storeMail(data,size,"Sent");
 
 free_con_session:
     mailsmtp_quit( session );
 free_mem_session:
     mailsmtp_free( session );
 free_mem:
     if (server) free( server );
     if ( smtp->getLogin() ) {
         free( user );
         free( pass );
     }
     return result;
 }
 
-void SMTPwrapper::sendMail(const Mail&mail,bool later )
+void SMTPwrapper::sendMail(const Mail&mail,SMTPaccount*aSmtp,bool later )
 {
     mailmime * mimeMail;
 
-    SMTPaccount *smtp = getAccount(mail.getName());
+    SMTPaccount *smtp = aSmtp;
 
+    if (!later && !smtp) {
+        qDebug("Didn't get any send method - giving up");
+        return;
+    }
     mimeMail = createMimeMail(mail );
     if ( mimeMail == NULL ) {
         qDebug( "sendMail: error creating mime mail" );
     } else {
         sendProgress = new progressMailSend();
         sendProgress->show();
         sendProgress->setMaxMails(1);
         smtpSend( mimeMail,later,smtp);
         qDebug("Clean up done");
         sendProgress->hide();
         delete sendProgress;
         sendProgress = 0;
         mailmime_free( mimeMail );
     }
 }
 
 int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
 {
     char*data = 0;
     size_t length = 0;
     size_t curTok = 0;
     mailimf_fields *fields = 0;
     mailimf_field*ffrom = 0;
     clist *rcpts = 0;
     char*from = 0;
     int res = 0;
 
     wrap->fetchRawBody(*which,&data,&length);
     if (!data) return 0;
     int err = mailimf_fields_parse( data, length, &curTok, &fields );
     if (err != MAILIMF_NO_ERROR) {
         free(data);
         delete wrap;
         return 0;
     }
 
     rcpts = createRcptList( fields );
     ffrom = getField(fields, MAILIMF_FIELD_FROM );
     from = getFrom(ffrom);
 
     qDebug("Size: %i vs. %i",length,strlen(data));
     if (rcpts && from) {
         res = smtpSend(from,rcpts,data,length,smtp );
     }
     if (fields) {
         mailimf_fields_free(fields);
         fields = 0;
     }
     if (data) {
         free(data);
     }    
     if (from) {
         free(from);
     }
     if (rcpts) {
         smtp_address_list_free( rcpts );
     }
     return res;
 }
 
 /* this is a special fun */
 bool SMTPwrapper::flushOutbox(SMTPaccount*smtp)
 {
     bool returnValue = true;
 
     if (!smtp) return false;
 
     QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
     MBOXwrapper*wrap = new MBOXwrapper(localfolders);
     if (!wrap) {
         qDebug("memory error");
         return false;
     }
     QList<RecMail> mailsToSend;
     QList<RecMail> mailsToRemove;
     QString mbox("Outgoing");
     wrap->listMessages(mbox,mailsToSend);
     if (mailsToSend.count()==0) {
         delete wrap;
         return false;
     }
     mailsToSend.setAutoDelete(false);
     sendProgress = new progressMailSend();
     sendProgress->show();
     sendProgress->setMaxMails(mailsToSend.count());
 
     while (mailsToSend.count()>0) {
         if (sendQueuedMail(wrap,smtp,mailsToSend.at(0))==0) {
             QMessageBox::critical(0,tr("Error sending mail"),
                 tr("Error sending queued mail - breaking"));
             returnValue = false;
             break;
         }
         mailsToRemove.append(mailsToSend.at(0));
         mailsToSend.removeFirst();
         sendProgress->setCurrentMails(mailsToRemove.count());
     }
     sendProgress->hide();
     delete sendProgress;
     sendProgress = 0;
     wrap->deleteMails(mbox,mailsToRemove);
     mailsToSend.setAutoDelete(true);
     delete wrap;
     return returnValue;
 }
diff --git a/noncore/net/mail/smtpwrapper.h b/noncore/net/mail/smtpwrapper.h
index f734fa4..0535983 100644
--- a/noncore/net/mail/smtpwrapper.h
+++ b/noncore/net/mail/smtpwrapper.h
@@ -1,62 +1,61 @@
 #ifndef SMTPwrapper_H
 #define SMTPwrapper_H
 
 #include <qpe/applnk.h>
 
 #include <qbitarray.h>
 #include <qdatetime.h>
 #include <libetpan/clist.h>
 
 #include "settings.h"
 
 class Mail;
 class MBOXwrapper;
 class RecMail;
 class Attachment;
 struct mailimf_fields;
 struct mailimf_field;
 struct mailimf_mailbox;
 struct mailmime;
 struct mailimf_address_list;
 class progressMailSend;
 
 class SMTPwrapper : public QObject
 {
     Q_OBJECT
 
 public:
     SMTPwrapper( Settings *s ); 
     virtual ~SMTPwrapper(){}
-    void sendMail(const Mail& mail,bool later=false );
+    void sendMail(const Mail& mail,SMTPaccount*smtp,bool later=false );
     bool flushOutbox(SMTPaccount*smtp);
 
     static progressMailSend*sendProgress;
 protected:
     mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
     mailimf_fields *createImfFields(const Mail &mail );
     mailmime *createMimeMail(const Mail&mail );
     
     mailimf_address_list *parseAddresses(const QString&addr );
     void addFileParts( mailmime *message,const QList<Attachment>&files );
     mailmime *buildTxtPart(const QString&str );
     mailmime *buildFilePart(const QString&filename,const QString&mimetype,const QString&content);
     void smtpSend( mailmime *mail,bool later, SMTPaccount *smtp );
     clist *createRcptList( mailimf_fields *fields );
-    SMTPaccount *getAccount(const QString&from );
     
     static void storeMail(char*mail, size_t length, const QString&box);
     static QString mailsmtpError( int err );
     static void progress( size_t current, size_t maximum );
     static void addRcpts( clist *list, mailimf_address_list *addr_list );
     static char *getFrom( mailmime *mail );
     static char *getFrom( mailimf_field *ffrom);
     static mailimf_field *getField( mailimf_fields *fields, int type );
     int smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp );
 
     void storeMail(mailmime*mail, const QString&box);
     Settings *settings;
     
     int sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which);
 };
 
 #endif