1 files changed, 14 insertions, 10 deletions

diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp
index f1075c0..49049f6 100644
--- a/kmicromail/editaccounts.cpp
+++ b/kmicromail/editaccounts.cpp
@@ -330,7 +330,7 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name,
 {
     data = account;
 
-    fillValues();
+    //fillValues();
 
     connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) );
     ComboBox1->insertItem( "Only if available", 0 );
@@ -338,7 +338,8 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name,
     ComboBox1->insertItem( "Connect on secure port", 2 );
     ComboBox1->insertItem( "Run command instead", 3 );
     CommandEdit->hide();
-    ComboBox1->setCurrentItem( data->ConnectionType() );
+    fillValues();
+    // ComboBox1->setCurrentItem( data->ConnectionType() );
 }
 
 void IMAPconfig::slotConnectionToggle( int index )
@@ -409,7 +410,7 @@ POP3config::POP3config( POP3account *account, QWidget *parent, const char *name,
         : POP3configUI( parent, name, modal, flags )
 {
     data = account;
-    fillValues();
+    //fillValues();
 
     connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) );
     ComboBox1->insertItem( "Only if available", 0 );
@@ -417,7 +418,8 @@ POP3config::POP3config( POP3account *account, QWidget *parent, const char *name,
     ComboBox1->insertItem( "Connect on secure port", 2 );
     ComboBox1->insertItem( "Run command instead", 3 );
     CommandEdit->hide();
-    ComboBox1->setCurrentItem( data->ConnectionType() );
+    fillValues();
+    //ComboBox1->setCurrentItem( data->ConnectionType() );
 }
 
 void POP3config::slotConnectionToggle( int index )
@@ -491,7 +493,7 @@ SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name,
     connect( loginBox, SIGNAL( toggled(bool) ), userLine, SLOT( setEnabled(bool) ) );
     connect( loginBox, SIGNAL( toggled(bool) ), passLine, SLOT( setEnabled(bool) ) );
 
-    fillValues();
+    // fillValues();
     QIconSet icon;
     //icon = SmallIcon("fileexport");
     icon = SmallIcon("fileopen");
@@ -500,12 +502,14 @@ SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name,
     SignaturButton->setMaximumSize ( SignaturButton->sizeHint().height()+4,SignaturButton->sizeHint().height()) ;
     connect( SignaturButton, SIGNAL( clicked() ), this, SLOT( chooseSig() ) );
     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 );
+    ComboBox1->insertItem( "No secure connection, no TLS", 0 );
+    ComboBox1->insertItem( "Only if available, try TLS", 1 );
+    ComboBox1->insertItem( "Always, use TLS", 2 );
+    ComboBox1->insertItem( "Connect on secure port (SSL)", 3 );
+    ComboBox1->insertItem( "Run command instead", 4 );
     CommandEdit->hide();
-    ComboBox1->setCurrentItem( data->ConnectionType() );
+    fillValues();
+    //ComboBox1->setCurrentItem( data->ConnectionType() );
 }
 void SMTPconfig::chooseSig()
 {