more smtp settings

5 files changed, 328 insertions, 179 deletions

diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp
index 0c0ecaf..9fc97e8 100644
--- a/noncore/net/mail/editaccounts.cpp
+++ b/noncore/net/mail/editaccounts.cpp
@@ -372,9 +372,19 @@ SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name,
 
-    connect( sslBox, SIGNAL( toggled( bool ) ), SLOT( slotSSL( bool ) ) );
+    connect( ComboBox1, SIGNAL( activated( int ) ), SLOT( slotConnectionToggle( int ) ) );
+    ComboBox1->insertItem( "Only if available", 0 );
+    ComboBox1->insertItem( "Always, Negotiated", 1 );
+    ComboBox1->insertItem( "Connect on secure port", 2 );
+    ComboBox1->insertItem( "Run command instead", 3 );
+    CommandEdit->hide();
+    ComboBox1->setCurrentItem( data->ConnectionType() );
 }
 
-void SMTPconfig::slotSSL( bool enabled )
+void SMTPconfig::slotConnectionToggle( int index )
 {
-    if ( enabled ) {
+    // 2 is ssl connection
+    if ( index == 2 ) {
         portLine->setText( SMTP_SSL_PORT );
+    } else if (  index == 3 ) {
+        portLine->setText( SMTP_PORT );
+        CommandEdit->show();
     } else {
@@ -389,3 +399,3 @@ void SMTPconfig::fillValues()
     portLine->setText( data->getPort() );
-    sslBox->setChecked( data->getSSL() );
+    ComboBox1->setCurrentItem( data->ConnectionType() );
     loginBox->setChecked( data->getLogin() );
@@ -400,3 +410,3 @@ void SMTPconfig::accept()
     data->setPort( portLine->text() );
-    data->setSSL( sslBox->isChecked() );
+    data->setConnectionType( ComboBox1->currentItem() );
     data->setLogin( loginBox->isChecked() );
diff --git a/noncore/net/mail/editaccounts.h b/noncore/net/mail/editaccounts.h
index fb4be71..d51e299 100644
--- a/noncore/net/mail/editaccounts.h
+++ b/noncore/net/mail/editaccounts.h
@@ -116,3 +116,2 @@ public:
 public slots:
-    void slotSSL( bool enabled );
     void fillValues();
@@ -120,2 +119,3 @@ public slots:
 protected slots:
+    void slotConnectionToggle( int index );
     void accept();
diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp
index 83e51e3..7b6a58d 100644
--- a/noncore/net/mail/libmailwrapper/settings.cpp
+++ b/noncore/net/mail/libmailwrapper/settings.cpp
@@ -285,2 +285,3 @@ SMTPaccount::SMTPaccount()
     ssl = false;
+    connectionType = 1;
     login = false;
@@ -299,2 +300,3 @@ SMTPaccount::SMTPaccount( QString filename )
     ssl = false;
+    connectionType = 1;
     login = false;
@@ -327,2 +329,3 @@ void SMTPaccount::read()
     ssl = conf->readBoolEntry( "SSL" );
+    connectionType = conf->readNumEntry( "ConnectionType" );
     login = conf->readBoolEntry( "Login" );
@@ -344,2 +347,3 @@ void SMTPaccount::save()
     conf->writeEntry( "SSL", ssl );
+    conf->writeEntry( "ConnectionType", connectionType );
     conf->writeEntry( "Login", login );
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index 08f6bb7..085d5e4 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -27,4 +27,3 @@ progressMailSend*SMTPwrapper::sendProgress = 0;
 SMTPwrapper::SMTPwrapper( Settings *s )
-    : QObject()
-{
+: QObject() {
     settings = s;
@@ -42,4 +41,3 @@ void SMTPwrapper::emitQCop( int queued ) {
 
-QString SMTPwrapper::mailsmtpError( int errnum )
-{
+QString SMTPwrapper::mailsmtpError( int errnum ) {
     switch ( errnum ) {
@@ -84,4 +82,3 @@ QString SMTPwrapper::mailsmtpError( int errnum )
 
-mailimf_mailbox *SMTPwrapper::newMailbox(const QString&name, const QString&mail )
-{
+mailimf_mailbox *SMTPwrapper::newMailbox(const QString&name, const QString&mail ) {
     return mailimf_mailbox_new( strdup( name.latin1() ),
@@ -90,7 +87,7 @@ mailimf_mailbox *SMTPwrapper::newMailbox(const QString&name, const QString&mail
 
-mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr )
-{
+mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr ) {
     mailimf_address_list *addresses;
 
-    if ( addr.isEmpty() ) return NULL;
+    if ( addr.isEmpty() )
+        return NULL;
 
@@ -141,4 +138,3 @@ mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr )
 
-mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail )
-{
+mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail ) {
     mailimf_fields *fields;
@@ -152,15 +148,20 @@ mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail )
     sender = newMailbox( mail.getName(), mail.getMail() );
-    if ( sender == NULL ) goto err_free;
+    if ( sender == NULL )
+        goto err_free;
 
     fromBox = newMailbox( mail.getName(), mail.getMail() );
-    if ( fromBox == NULL ) goto err_free_sender;
+    if ( fromBox == NULL )
+        goto err_free_sender;
 
     from = mailimf_mailbox_list_new_empty();
-    if ( from == NULL ) goto err_free_fromBox;
+    if ( from == NULL )
+        goto err_free_fromBox;
 
     err = mailimf_mailbox_list_add( from, fromBox );
-    if ( err != MAILIMF_NO_ERROR ) goto err_free_from;
+    if ( err != MAILIMF_NO_ERROR )
+        goto err_free_from;
 
     to = parseAddresses( mail.getTo() );
-    if ( to == NULL ) goto err_free_from;
+    if ( to == NULL )
+        goto err_free_from;
 
@@ -172,3 +173,4 @@ mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail )
                                            NULL, NULL, subject );
-    if ( fields == NULL ) goto err_free_reply;
+    if ( fields == NULL )
+        goto err_free_reply;
 
@@ -176,6 +178,8 @@ mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail )
                                         strdup( USER_AGENT ) );
-    if ( xmailer == NULL ) goto err_free_fields;
+    if ( xmailer == NULL )
+        goto err_free_fields;
 
     err = mailimf_fields_add( fields, xmailer );
-    if ( err != MAILIMF_NO_ERROR ) goto err_free_xmailer;
+    if ( err != MAILIMF_NO_ERROR )
+        goto err_free_xmailer;
 
@@ -184,12 +188,19 @@ mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail )
 err_free_xmailer:
-    if (xmailer) mailimf_field_free( xmailer );
+    if (xmailer)
+        mailimf_field_free( xmailer );
 err_free_fields:
-    if (fields) mailimf_fields_free( fields );
+    if (fields)
+        mailimf_fields_free( fields );
 err_free_reply:
-    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 );
+    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:
-    if (from) mailimf_mailbox_list_free( from );
+    if (from)
+        mailimf_mailbox_list_free( from );
 err_free_fromBox:
@@ -197,5 +208,7 @@ err_free_fromBox:
 err_free_sender:
-    if (sender) mailimf_mailbox_free( sender );
+    if (sender)
+        mailimf_mailbox_free( sender );
 err_free:
-    if (subject) free( subject );
+    if (subject)
+        free( subject );
     qDebug( "createImfFields - error" );
@@ -205,4 +218,3 @@ err_free:
 
-mailmime *SMTPwrapper::buildTxtPart(const QString&str )
-{
+mailmime *SMTPwrapper::buildTxtPart(const QString&str ) {
     mailmime *txtPart;
@@ -215,18 +227,24 @@ mailmime *SMTPwrapper::buildTxtPart(const QString&str )
                                     strdup( "iso-8859-1" ) );
-    if ( param == NULL ) goto err_free;
+    if ( param == NULL )
+        goto err_free;
 
     content = mailmime_content_new_with_str( "text/plain" );
-    if ( content == NULL ) goto err_free_param;
+    if ( content == NULL )
+        goto err_free_param;
 
     err = clist_append( content->ct_parameters, param );
-    if ( err != MAILIMF_NO_ERROR ) goto err_free_content;
+    if ( err != MAILIMF_NO_ERROR )
+        goto err_free_content;
 
     fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_8BIT);
-    if ( fields == NULL ) goto err_free_content;
+    if ( fields == NULL )
+        goto err_free_content;
 
     txtPart = mailmime_new_empty( content, fields );
-    if ( txtPart == NULL ) goto err_free_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;
+    if ( err != MAILIMF_NO_ERROR )
+        goto err_free_txtPart;
 
@@ -248,4 +266,3 @@ err_free:
 
-mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimetype,const QString&TextContent )
-{
+mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimetype,const QString&TextContent ) {
     mailmime * filePart = 0;
@@ -327,4 +344,3 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
 
-void SMTPwrapper::addFileParts( mailmime *message,const QList<Attachment>&files )
-{
+void SMTPwrapper::addFileParts( mailmime *message,const QList<Attachment>&files ) {
     const Attachment *it;
@@ -352,4 +368,3 @@ void SMTPwrapper::addFileParts( mailmime *message,const QList<Attachment>&files
 
-mailmime *SMTPwrapper::createMimeMail(const Mail &mail )
-{
+mailmime *SMTPwrapper::createMimeMail(const Mail &mail ) {
     mailmime *message, *txtPart;
@@ -359,6 +374,8 @@ mailmime *SMTPwrapper::createMimeMail(const Mail &mail )
     fields = createImfFields( mail );
-    if ( fields == NULL ) goto err_free;
+    if ( fields == NULL )
+        goto err_free;
 
     message = mailmime_new_message_data( NULL );
-    if ( message == NULL ) goto err_free_fields;
+    if ( message == NULL )
+        goto err_free_fields;
 
@@ -368,6 +385,8 @@ mailmime *SMTPwrapper::createMimeMail(const Mail &mail )
 
-    if ( txtPart == NULL ) goto err_free_message;
+    if ( txtPart == NULL )
+        goto err_free_message;
 
     err = mailmime_smart_add_part( message, txtPart );
-    if ( err != MAILIMF_NO_ERROR ) goto err_free_txtPart;
+    if ( err != MAILIMF_NO_ERROR )
+        goto err_free_txtPart;
 
@@ -389,4 +408,3 @@ err_free:
 
-mailimf_field *SMTPwrapper::getField( mailimf_fields *fields, int type )
-{
+mailimf_field *SMTPwrapper::getField( mailimf_fields *fields, int type ) {
     mailimf_field *field;
@@ -406,4 +424,3 @@ mailimf_field *SMTPwrapper::getField( mailimf_fields *fields, int type )
 
-void SMTPwrapper::addRcpts( clist *list, mailimf_address_list *addr_list )
-{
+void SMTPwrapper::addRcpts( clist *list, mailimf_address_list *addr_list ) {
     clistiter *it, *it2;
@@ -427,4 +444,3 @@ void SMTPwrapper::addRcpts( clist *list, mailimf_address_list *addr_list )
 
-clist *SMTPwrapper::createRcptList( mailimf_fields *fields )
-{
+clist *SMTPwrapper::createRcptList( mailimf_fields *fields ) {
     clist *rcptList;
@@ -455,4 +471,3 @@ clist *SMTPwrapper::createRcptList( mailimf_fields *fields )
 
-char *SMTPwrapper::getFrom( mailimf_field *ffrom)
-{
+char *SMTPwrapper::getFrom( mailimf_field *ffrom) {
     char *from = NULL;
@@ -471,4 +486,3 @@ char *SMTPwrapper::getFrom( mailimf_field *ffrom)
 
-char *SMTPwrapper::getFrom( mailmime *mail )
-{
+char *SMTPwrapper::getFrom( mailmime *mail ) {
     /* no need to delete - its just a pointer to structure content */
@@ -479,4 +493,3 @@ char *SMTPwrapper::getFrom( mailmime *mail )
 
-void SMTPwrapper::progress( size_t current, size_t maximum )
-{
+void SMTPwrapper::progress( size_t current, size_t maximum ) {
     if (SMTPwrapper::sendProgress) {
@@ -487,5 +500,5 @@ void SMTPwrapper::progress( size_t current, size_t maximum )
 
-void SMTPwrapper::storeMail(const char*mail, size_t length, const QString&box)
-{
-    if (!mail) return;
+void SMTPwrapper::storeMail(const char*mail, size_t length, const QString&box) {
+    if (!mail)
+        return;
     QString localfolders = AbstractMail::defaultLocalfolder();
@@ -497,4 +510,3 @@ void SMTPwrapper::storeMail(const char*mail, size_t length, const QString&box)
 
-void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
-{
+void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp ) {
     clist *rcpts = 0;
@@ -515,3 +527,4 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
     if (r != MAIL_NO_ERROR || !data) {
-        if (data) free(data);
+        if (data)
+            free(data);
         qDebug("Error fetching mime...");
@@ -522,3 +535,4 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
         storeMail(data,size,"Outgoing");
-        if (data) free( data );
+        if (data)
+            free( data );
         Config cfg( "mail" );
@@ -532,9 +546,13 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
     smtpSend(from,rcpts,data,size,smtp);
-    if (data) {free(data);}
-    if (from) {free(from);}
-    if (rcpts) smtp_address_list_free( rcpts );
+    if (data) {
+        free(data);
+    }
+    if (from) {
+        free(from);
+    }
+    if (rcpts)
+        smtp_address_list_free( rcpts );
 }
 
-int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMTPaccount *smtp )
-{
+int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMTPaccount *smtp ) {
     const char *server, *user, *pass;
@@ -548,3 +566,11 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMT
     server = smtp->getServer().latin1();
-    ssl = smtp->getSSL();
+
+    // FIXME: currently only TLS and Plain work.
+
+    ssl = false;
+
+    if  ( smtp->ConnectionType() == 2 ) {
+        ssl = true;
+    }
+
     port = smtp->getPort().toUInt();
@@ -552,3 +578,4 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMT
     session = mailsmtp_new( 20, &progress );
-    if ( session == NULL ) goto free_mem;
+    if ( session == NULL )
+        goto free_mem;
 
@@ -562,6 +589,13 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMT
     }
-    if ( err != MAILSMTP_NO_ERROR ) {qDebug("Error init connection");result = 0;goto free_mem_session;}
+    if ( err != MAILSMTP_NO_ERROR ) {
+        qDebug("Error init connection");
+        result = 0;
+        goto free_mem_session;
+    }
 
     err = mailsmtp_init( session );
-    if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;}
+    if ( err != MAILSMTP_NO_ERROR ) {
+        result = 0;
+        goto free_con_session;
+    }
 
@@ -580,3 +614,4 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMT
             } else {
-                result = 0; goto free_con_session;
+                result = 0;
+                goto free_con_session;
             }
@@ -588,3 +623,4 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMT
         err = mailsmtp_auth( session, (char*)user, (char*)pass );
-        if ( err == MAILSMTP_NO_ERROR ) qDebug("auth ok");
+        if ( err == MAILSMTP_NO_ERROR )
+            qDebug("auth ok");
         qDebug( "Done auth!" );
@@ -597,3 +633,4 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMT
         qDebug("Error sending mail: %s",mailsmtpError(err).latin1());
-        result = 0; goto free_con_session;
+        result = 0;
+        goto free_con_session;
     }
@@ -611,4 +648,3 @@ free_mem:
 
-void SMTPwrapper::sendMail(const Mail&mail,SMTPaccount*aSmtp,bool later )
-{
+void SMTPwrapper::sendMail(const Mail&mail,SMTPaccount*aSmtp,bool later ) {
     mailmime * mimeMail;
@@ -637,4 +673,3 @@ void SMTPwrapper::sendMail(const Mail&mail,SMTPaccount*aSmtp,bool later )
 
-int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,SMTPaccount*smtp,RecMail*which)
-{
+int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,SMTPaccount*smtp,RecMail*which) {
     size_t curTok = 0;
@@ -647,3 +682,4 @@ int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,SMTPaccount*smtp,RecMail*which
     encodedString * data = wrap->fetchRawBody(*which);
-    if (!data) return 0;
+    if (!data)
+        return 0;
     int err = mailimf_fields_parse( data->Content(), data->Length(), &curTok, &fields );
@@ -679,7 +715,7 @@ int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,SMTPaccount*smtp,RecMail*which
 /* this is a special fun */
-bool SMTPwrapper::flushOutbox(SMTPaccount*smtp)
-{
+bool SMTPwrapper::flushOutbox(SMTPaccount*smtp) {
     bool returnValue = true;
 
-    if (!smtp) return false;
+    if (!smtp)
+        return false;
 
diff --git a/noncore/net/mail/smtpconfigui.ui b/noncore/net/mail/smtpconfigui.ui
index f5ce8cb..d4151a9 100644
--- a/noncore/net/mail/smtpconfigui.ui
+++ b/noncore/net/mail/smtpconfigui.ui
@@ -13,4 +13,4 @@
             <y>0</y>
-            <width>241</width>
-            <height>321</height>
+            <width>335</width>
+            <height>426</height>
         </rect>
@@ -30,3 +30,3 @@
             <name>margin</name>
-            <number>2</number>
+            <number>3</number>
         </property>
@@ -34,53 +34,79 @@
             <name>spacing</name>
-            <number>2</number>
+            <number>3</number>
         </property>
         <widget>
-            <class>QLayoutWidget</class>
+            <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>
+            <class>QLineEdit</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout4</cstring>
+                <cstring>accountLine</cstring>
             </property>
             <property>
-                <name>layoutSpacing</name>
+                <name>toolTip</name>
+                <string>Name of the Account</string>
             </property>
-            <grid>
+        </widget>
+        <widget>
+            <class>Line</class>
                 <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
+                <name>name</name>
+                <cstring>line1</cstring>
                 </property>
                 <property stdset="1">
-                    <name>spacing</name>
-                    <number>2</number>
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>1</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
                 </property>
-                <widget row="0"  column="0"  rowspan="1"  colspan="2" >
-                    <class>QLabel</class>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
+            </property>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>accountLabel</cstring>
+                <cstring>Layout20</cstring>
                     </property>
+            <hbox>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>Account</string>
+                    <name>margin</name>
+                    <number>0</number>
                     </property>
-                </widget>
-                <widget row="8"  column="2" >
-                    <class>QLineEdit</class>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>passLine</cstring>
+                        <cstring>Layout18</cstring>
                     </property>
+                    <vbox>
                     <property stdset="1">
-                        <name>enabled</name>
-                        <bool>false</bool>
+                            <name>margin</name>
+                            <number>0</number>
                     </property>
                     <property stdset="1">
-                        <name>echoMode</name>
-                        <enum>Password</enum>
+                            <name>spacing</name>
+                            <number>6</number>
                     </property>
-                </widget>
-                <widget row="4"  column="0"  rowspan="1"  colspan="3" >
-                    <class>QCheckBox</class>
+                        <widget>
+                            <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>sslBox</cstring>
+                                <cstring>serverLabel</cstring>
                     </property>
@@ -88,10 +114,10 @@
                         <name>text</name>
-                        <string>Use SSL</string>
+                                <string>Server</string>
                     </property>
                 </widget>
-                <widget row="6"  column="0"  rowspan="1"  colspan="3" >
-                    <class>QCheckBox</class>
+                        <widget>
+                            <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>loginBox</cstring>
+                                <cstring>portLabel</cstring>
                     </property>
@@ -99,17 +125,23 @@
                         <name>text</name>
-                        <string>Use Login</string>
+                                <string>Port</string>
                     </property>
                 </widget>
-                <widget row="0"  column="2" >
-                    <class>QLineEdit</class>
+                    </vbox>
+                </widget>
+                <widget>
+                    <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>accountLine</cstring>
+                        <cstring>Layout19</cstring>
                     </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Name of the Account</string>
+                    <vbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
                     </property>
-                </widget>
-                <widget row="2"  column="1"  rowspan="1"  colspan="2" >
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
+                        </property>
+                        <widget>
                     <class>QLineEdit</class>
@@ -124,3 +156,3 @@
                 </widget>
-                <widget row="7"  column="2" >
+                        <widget>
                     <class>QLineEdit</class>
@@ -128,21 +160,14 @@
                         <name>name</name>
-                        <cstring>userLine</cstring>
+                                <cstring>portLine</cstring>
                     </property>
-                    <property stdset="1">
-                        <name>enabled</name>
-                        <bool>false</bool>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Port of the SMTP Server</string>
                     </property>
                 </widget>
-                <widget row="8"  column="0"  rowspan="1"  colspan="2" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>passLabel</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Password</string>
-                    </property>
+                    </vbox>
+                </widget>
+            </hbox>
                 </widget>
-                <widget row="3"  column="0" >
+        <widget>
                     <class>QLabel</class>
@@ -150,3 +175,3 @@
                         <name>name</name>
-                        <cstring>portLabel</cstring>
+                <cstring>TextLabel1</cstring>
                     </property>
@@ -154,17 +179,13 @@
                         <name>text</name>
-                        <string>Port</string>
+                <string>Use secure sockets:</string>
                     </property>
                 </widget>
-                <widget row="2"  column="0" >
-                    <class>QLabel</class>
+        <widget>
+            <class>QComboBox</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>serverLabel</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Server</string>
+                <cstring>ComboBox1</cstring>
                     </property>
                 </widget>
-                <widget row="3"  column="1"  rowspan="1"  colspan="2" >
+        <widget>
                     <class>QLineEdit</class>
@@ -172,10 +193,10 @@
                         <name>name</name>
-                        <cstring>portLine</cstring>
+                <cstring>CommandEdit</cstring>
                     </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Port of the SMTP Server</string>
+            <property stdset="1">
+                <name>text</name>
+                <string>ssh $SERVER exec</string>
                     </property>
                 </widget>
-                <widget row="1"  column="0"  rowspan="1"  colspan="3" >
+        <widget>
                     <class>Line</class>
@@ -183,3 +204,3 @@
                         <name>name</name>
-                        <cstring>line1</cstring>
+                <cstring>line2</cstring>
                     </property>
@@ -188,3 +209,3 @@
                         <sizepolicy>
-                            <hsizetype>3</hsizetype>
+                    <hsizetype>1</hsizetype>
                             <vsizetype>0</vsizetype>
@@ -197,3 +218,44 @@
                 </widget>
-                <widget row="7"  column="0"  rowspan="1"  colspan="2" >
+        <widget>
+            <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>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout17</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QLayoutWidget</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Layout15</cstring>
+                    </property>
+                    <vbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
+                        </property>
+                        <widget>
                     <class>QLabel</class>
@@ -208,21 +270,59 @@
                 </widget>
-                <widget row="5"  column="0"  rowspan="1"  colspan="3" >
-                    <class>Line</class>
+                        <widget>
+                            <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>line2</cstring>
+                                <cstring>passLabel</cstring>
                     </property>
                     <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
+                                <name>text</name>
+                                <string>Password</string>
+                            </property>
+                        </widget>
+                    </vbox>
+                </widget>
+                <widget>
+                    <class>QLayoutWidget</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Layout16</cstring>
+                    </property>
+                    <vbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
                     </property>
                     <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
+                            <name>spacing</name>
+                            <number>6</number>
                     </property>
+                        <widget>
+                            <class>QLineEdit</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>userLine</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>enabled</name>
+                                <bool>false</bool>
+                            </property>
+                        </widget>
+                        <widget>
+                            <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>
+                    </vbox>
                 </widget>
-            </grid>
+            </hbox>
         </widget>
@@ -255,3 +355,2 @@
     <tabstop>portLine</tabstop>
-    <tabstop>sslBox</tabstop>
     <tabstop>loginBox</tabstop>