2 files changed, 8 insertions, 5 deletions

diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp
index 215380d..b8aad11 100644
--- a/noncore/net/mail/editaccounts.cpp
+++ b/noncore/net/mail/editaccounts.cpp
@@ -514,13 +514,13 @@ void NNTPconfig::slotGetNG() {
                group = (  newsnntp_group_description* ) current->data;
              // qDebug(  group->grp_name );
 
                   QCheckListItem *item;
                item = new QCheckListItem( ListViewGroups, ( QString )group->grp_name, QCheckListItem::CheckBox );
                  if ( subscribedGroups.contains( ( QString )group->grp_name ) >= 1 ) {
-                      item->setSelected( true );
+                      item->setOn( true );
                 }
        }
 }
 
 void NNTPconfig::slotSSL( bool enabled )
 {
@@ -554,20 +554,23 @@ void NNTPconfig::save()
     data->setSSL( sslBox->isChecked() );
     data->setLogin( loginBox->isChecked() );
     data->setUser( userLine->text() );
     data->setPassword( passLine->text() );
 
    QListViewItemIterator list_it( ListViewGroups );
-   for ( ; list_it.current(); ++list_it ) {
+
        QStringList groupList;
-       if ( list_it.current()->isSelected() ) {
+   for ( ; list_it.current(); ++list_it ) {
+
+       if ( ( (QCheckListItem*)list_it.current() )->isOn() ) {
           qDebug(list_it.current()->text(0) );
           groupList.append(  list_it.current()->text(0) );
       }
-      data->setGroups( groupList );
+
   }
+      data->setGroups( groupList );
 }
 
 void NNTPconfig::accept()
 {
     save();
     QDialog::accept();
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
index 2d6f9a3..ecdf848 100644
--- a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
@@ -121,13 +121,13 @@ void NNTPwrapper::login()
 
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
 
     user = pass = 0;
 
-    if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) {
+    if ( ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) && account->getLogin() ) {
         LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
         login.show();
         if ( QDialog::Accepted == login.exec() ) {
             // ok
             User = login.getUser().latin1();
             Pass = login.getPassword().latin1();