3 files changed, 25 insertions, 18 deletions

diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp
index 1c80adb..1246037 100644
--- a/noncore/net/mail/editaccounts.cpp
+++ b/noncore/net/mail/editaccounts.cpp
@@ -18,3 +18,3 @@ EditAccounts::EditAccounts( Settings *s, QWidget *parent, const char *name, bool
     settings = s;
-    
+
     mailList->addColumn( tr( "Account" ) );
@@ -23,3 +23,3 @@ EditAccounts::EditAccounts( Settings *s, QWidget *parent, const char *name, bool
     newsList->addColumn( tr( "Account" ) );
-    
+
     connect( newMail, SIGNAL( clicked() ), SLOT( slotNewMail() ) );
@@ -72,3 +72,3 @@ void EditAccounts::slotNewAccount( const QString &type )
             slotFillLists();
-        } else {
+          } else {
             account->remove();
@@ -96,2 +96,3 @@ void EditAccounts::slotNewAccount( const QString &type )
             slotFillLists();
+
         } else {
@@ -149,3 +150,3 @@ void EditAccounts::slotDeleteAccount( Account *account )
 {
-    if ( QMessageBox::information( this, tr( "Question" ), 
+    if ( QMessageBox::information( this, tr( "Question" ),
          tr( "<p>Do you really want to delete the selected Account?</p>" ),
@@ -161,3 +162,3 @@ void EditAccounts::slotEditMail()
     if ( !mailList->currentItem() ) {
-        QMessageBox::information( this, tr( "Error" ), 
+        QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select an account.</p>" ),
@@ -174,3 +175,3 @@ void EditAccounts::slotDeleteMail()
     if ( !mailList->currentItem() ) {
-        QMessageBox::information( this, tr( "Error" ), 
+        QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select an account.</p>" ),
@@ -179,3 +180,3 @@ void EditAccounts::slotDeleteMail()
     }
-    
+
     Account *a = ((AccountListItem *) mailList->currentItem())->getAccount();
@@ -194,3 +195,3 @@ void EditAccounts::slotEditNews()
     if ( !newsList->currentItem() ) {
-        QMessageBox::information( this, tr( "Error" ), 
+        QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select an account.</p>" ),
@@ -208,3 +209,3 @@ void EditAccounts::slotDeleteNews()
     if ( !newsList->currentItem() ) {
-        QMessageBox::information( this, tr( "Error" ), 
+        QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select an account.</p>" ),
@@ -213,3 +214,3 @@ void EditAccounts::slotDeleteNews()
     }
-    
+
     Account *a = ((AccountListItem *) newsList->currentItem())->getAccount();
@@ -221,3 +222,3 @@ void EditAccounts::slotAdjustColumns()
     int currPage = configTab->currentPageIndex();
-    
+
     configTab->showPage( mailTab );
@@ -235,3 +236,3 @@ void EditAccounts::accept()
     settings->saveAccounts();
-    
+
     QDialog::accept();
@@ -264,3 +265,3 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name,
     data = account;
-    
+
     fillValues();
@@ -431,3 +432,3 @@ NNTPconfig::NNTPconfig( NNTPaccount *account, QWidget *parent, const char *name,
     connect( loginBox, SIGNAL( toggled( bool ) ), passLine, SLOT( setEnabled( bool ) ) );
-    
+
     fillValues();
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 93f3bb7..740e4cf 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -8,5 +8,5 @@ OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
     settings = new Settings();
- 
+
     folderView->populate( settings->getAccounts() );
-    
+
     connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) );
@@ -49,2 +49,7 @@ void OpieMail::slotEditAccounts()
     eaDialog.exec();
+    if ( settings ) delete settings;
+    settings = new Settings();
+
+    folderView->populate( settings->getAccounts() );
 }
+
diff --git a/noncore/net/mail/opiemail.h b/noncore/net/mail/opiemail.h
index 7bcd818..ba60297 100644
--- a/noncore/net/mail/opiemail.h
+++ b/noncore/net/mail/opiemail.h
@@ -13,4 +13,6 @@ public:
     static QString appName() { return QString::fromLatin1("opiemail"); }
-protected slots:
+
+public slots:
     void slotComposeMail();
+protected slots:
     void slotSendQueued();
@@ -19,3 +21,2 @@ protected slots:
     void slotEditAccounts();
-    
 private: