diff --git a/resources/imap/setupserver.cpp b/resources/imap/setupserver.cpp
index 26653f690..f5d74c1a9 100644
--- a/resources/imap/setupserver.cpp
+++ b/resources/imap/setupserver.cpp
@@ -1,660 +1,677 @@
 /* This file is part of the KDE project
 
    Copyright (c) 2010 Klarälvdalens Datakonsult AB,
                       a KDAB Group company <info@kdab.com>
    Author: Kevin Ottens <kevin@kdab.com>
 
    Copyright (C) 2010 Casey Link <unnamedrambler@gmail.com>
    Copyright (c) 2009-2010 Klaralvdalens Datakonsult AB, a KDAB Group company <info@kdab.net>
    Copyright (C) 2009 Kevin Ottens <ervin@kde.org>
    Copyright (C) 2006-2008 Omat Holding B.V. <info@omat.nl>
    Copyright (C) 2006 Frode M. Døving <frode@lnix.net>
 
    Original copied from showfoto:
     Copyright 2005 by Gilles Caulier <caulier.gilles@free.fr>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #include "setupserver.h"
 #include "settings.h"
 #include "imapresource.h"
 #include "serverinfodialog.h"
 #include "resources/folderarchivesettings/folderarchivesettingpage.h"
 
 
 #include <mailtransport/transport.h>
 #include <mailtransport/servertest.h>
 
 #include <kmime/kmime_message.h>
 
 #include <akonadi/collectionfetchjob.h>
 #include <akonadi/kmime/specialmailcollections.h>
 #include <akonadi/kmime/specialmailcollectionsrequestjob.h>
 #include <akonadi/resourcesettings.h>
 #include <akonadi/entitydisplayattribute.h>
 #include <Akonadi/CollectionModifyJob>
 #include <kemailsettings.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
 #include <kuser.h>
 #ifndef IMAPRESOURCE_NO_SOLID
 #include <solid/networking.h>
 #endif
 
 #include <kpimidentities/identitymanager.h>
 #include <kpimidentities/identitycombo.h>
 
 #include "imapaccount.h"
 #include "subscriptiondialog.h"
 
 #ifdef KDEPIM_MOBILE_UI
 #include "ui_setupserverview_mobile.h"
 #else
 #include "ui_setupserverview_desktop.h"
 #endif
 #include "ui_serverinfo.h"
 
 /** static helper functions **/
 static QString authenticationModeString( MailTransport::Transport::EnumAuthenticationType::type mode )
 {
   switch ( mode ) {
     case  MailTransport::Transport::EnumAuthenticationType::LOGIN:
       return QLatin1String("LOGIN");
     case MailTransport::Transport::EnumAuthenticationType::PLAIN:
       return QLatin1String("PLAIN");
     case MailTransport::Transport::EnumAuthenticationType::CRAM_MD5:
       return QLatin1String("CRAM-MD5");
     case MailTransport::Transport::EnumAuthenticationType::DIGEST_MD5:
       return QLatin1String("DIGEST-MD5");
     case MailTransport::Transport::EnumAuthenticationType::GSSAPI:
       return QLatin1String("GSSAPI");
     case MailTransport::Transport::EnumAuthenticationType::NTLM:
       return QLatin1String("NTLM");
     case MailTransport::Transport::EnumAuthenticationType::CLEAR:
       return i18nc( "Authentication method", "Clear text" );
     case MailTransport::Transport::EnumAuthenticationType::ANONYMOUS:
       return i18nc( "Authentication method", "Anonymous" );
     default:
       break;
   }
   return QString();
 }
 
 static void setCurrentAuthMode( QComboBox* authCombo, MailTransport::Transport::EnumAuthenticationType::type authtype )
 {
   kDebug() << "setting authcombo: " << authenticationModeString( authtype );
   int index = authCombo->findData( authtype );
   if ( index == -1 )
     kWarning() << "desired authmode not in the combo";
   kDebug() << "found corresponding index: " << index << "with data" << authenticationModeString( (MailTransport::Transport::EnumAuthenticationType::type) authCombo->itemData( index ).toInt() );
   authCombo->setCurrentIndex( index );
   MailTransport::Transport::EnumAuthenticationType::type t = (MailTransport::Transport::EnumAuthenticationType::type) authCombo->itemData( authCombo->currentIndex() ).toInt();
   kDebug() << "selected auth mode:" << authenticationModeString( t );
   Q_ASSERT( t == authtype );
 }
 
 static MailTransport::Transport::EnumAuthenticationType::type getCurrentAuthMode( QComboBox* authCombo )
 {
   MailTransport::Transport::EnumAuthenticationType::type authtype = (MailTransport::Transport::EnumAuthenticationType::type) authCombo->itemData( authCombo->currentIndex() ).toInt();
   kDebug() << "current auth mode: " << authenticationModeString( authtype );
   return authtype;
 }
 
 static void addAuthenticationItem( QComboBox* authCombo, MailTransport::Transport::EnumAuthenticationType::type authtype )
 {
     kDebug() << "adding auth item " << authenticationModeString( authtype );
     authCombo->addItem( authenticationModeString( authtype ), QVariant( authtype ) );
 }
 
 SetupServer::SetupServer( ImapResourceBase *parentResource, WId parent )
   : KDialog(), m_parentResource( parentResource ), m_ui(new Ui::SetupServerView), m_serverTest(0),
     m_subscriptionsChanged(false), m_shouldClearCache(false), mValidator( this )
 {
   m_parentResource->settings()->setWinId( parent );
   m_ui->setupUi( mainWidget() );
   m_folderArchiveSettingPage = new FolderArchiveSettingPage(m_parentResource->identifier());
   m_ui->tabWidget->addTab(m_folderArchiveSettingPage, i18n("Folder Archive"));
   m_ui->safeImapGroup->setId( m_ui->noRadio, KIMAP::LoginJob::Unencrypted );
   m_ui->safeImapGroup->setId( m_ui->sslRadio, KIMAP::LoginJob::AnySslVersion );
   m_ui->safeImapGroup->setId( m_ui->tlsRadio, KIMAP::LoginJob::TlsV1 );
 
   connect( m_ui->noRadio, SIGNAL(toggled(bool)),
            this, SLOT(slotSafetyChanged()) );
   connect( m_ui->sslRadio, SIGNAL(toggled(bool)),
            this, SLOT(slotSafetyChanged()) );
   connect( m_ui->tlsRadio, SIGNAL(toggled(bool)),
            this, SLOT(slotSafetyChanged()) );
 
   m_ui->testInfo->hide();
   m_ui->testProgress->hide();
   m_ui->accountName->setFocus();
   m_ui->checkInterval->setSuffix( ki18np( " minute", " minutes" ) );
   m_ui->checkInterval->setRange( Akonadi::ResourceSettings::self()->minimumCheckInterval(), 10000, 1 );
 
   // regex for evaluating a valid server name/ip
   mValidator.setRegExp( QRegExp( QLatin1String("[A-Za-z0-9-_:.]*") ) );
   m_ui->imapServer->setValidator( &mValidator );
 
+  // regex for evaluating a valid sieve url
+  mSieveUrlValidator.setRegExp(QRegExp(QLatin1String("(sieve://)?[A-Za-z0-9-_.]*(:[0-9]+)?(/.*)?")));
+  m_ui->alternateURL->setValidator(&mSieveUrlValidator);
+
   m_ui->folderRequester->setMimeTypeFilter(
     QStringList() << KMime::Message::mimeType() );
   m_ui->folderRequester->setAccessRightsFilter( Akonadi::Collection::CanChangeItem | Akonadi::Collection::CanCreateItem | Akonadi::Collection::CanDeleteItem );
   m_ui->folderRequester->changeCollectionDialogOptions( Akonadi::CollectionDialog::AllowToCreateNewChildCollection );
   m_identityManager = new KPIMIdentities::IdentityManager( false, this, "mIdentityManager" );
   m_identityCombobox = new KPIMIdentities::IdentityCombo( m_identityManager, this );
   m_ui->identityLabel->setBuddy( m_identityCombobox );
   m_ui->identityLayout->addWidget( m_identityCombobox, 1 );
   m_ui->identityLabel->setBuddy( m_identityCombobox );
 
 
   connect( m_ui->testButton, SIGNAL(pressed()), SLOT(slotTest()) );
 
   connect( m_ui->imapServer, SIGNAL(textChanged(QString)),
            SLOT(slotTestChanged()) );
   connect( m_ui->imapServer, SIGNAL(textChanged(QString)),
            SLOT(slotComplete()) );
   connect( m_ui->userName, SIGNAL(textChanged(QString)),
            SLOT(slotComplete()) );
   connect( m_ui->subscriptionEnabled, SIGNAL(toggled(bool)), this, SLOT(slotSubcriptionCheckboxChanged()) );
   connect( m_ui->subscriptionButton, SIGNAL(pressed()), SLOT(slotManageSubscriptions()) );
 
   connect( m_ui->managesieveCheck, SIGNAL(toggled(bool)),
            SLOT(slotEnableWidgets()) );
   connect( m_ui->sameConfigCheck, SIGNAL(toggled(bool)),
            SLOT(slotEnableWidgets()) );
 
 
   connect( m_ui->useDefaultIdentityCheck, SIGNAL(toggled(bool)), this, SLOT(slotIdentityCheckboxChanged()) );
   connect( m_ui->enableMailCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotMailCheckboxChanged()) );
   connect( m_ui->safeImapGroup, SIGNAL(buttonClicked(int)), this, SLOT(slotEncryptionRadioChanged()) );
   connect( m_ui->customSieveGroup, SIGNAL(buttonClicked(int)), this, SLOT(slotCustomSieveChanged()) );
   connect( m_ui->showServerInfo, SIGNAL(pressed()), this, SLOT(slotShowServerInfo()) );
 
   readSettings();
   slotTestChanged();
   slotComplete();
   slotCustomSieveChanged();
+  slotEnableWidgets();
 #ifndef IMAPRESOURCE_NO_SOLID
   connect( Solid::Networking::notifier(),
            SIGNAL(statusChanged(Solid::Networking::Status)),
            SLOT(slotTestChanged()) );
 #endif
   connect( this, SIGNAL(applyClicked()),
            SLOT(applySettings()) );
   connect( this, SIGNAL(okClicked()),
            SLOT(applySettings()) );
 }
 
 SetupServer::~SetupServer()
 {
   delete m_ui;
 }
 
 bool SetupServer::shouldClearCache() const
 {
   return m_shouldClearCache;
 }
 
 void SetupServer::slotSubcriptionCheckboxChanged()
 {
   m_ui->subscriptionButton->setEnabled( m_ui->subscriptionEnabled->isChecked() );
 }
 
 void SetupServer::slotIdentityCheckboxChanged()
 {
   m_identityCombobox->setEnabled( !m_ui->useDefaultIdentityCheck->isChecked() );
 }
 
 void SetupServer::slotMailCheckboxChanged()
 {
   m_ui->checkInterval->setEnabled( m_ui->enableMailCheckBox->isChecked() );
 }
 
 void SetupServer::slotEncryptionRadioChanged()
 {
   // TODO these really should be defined somewhere else
   switch ( m_ui->safeImapGroup->checkedId() ) {
     case KIMAP::LoginJob::Unencrypted:
     case KIMAP::LoginJob::TlsV1:
       m_ui->portSpin->setValue( 143 );
       break;
     case KIMAP::LoginJob::AnySslVersion:
       m_ui->portSpin->setValue( 993 );
       break;
   default:
     kFatal() << "Shouldn't happen";
   }
 }
 
 void SetupServer::slotCustomSieveChanged()
 {
     QAbstractButton *checkedButton = m_ui->customSieveGroup->checkedButton();
 
     if (checkedButton == m_ui->imapUserPassword ||
             checkedButton == m_ui->noAuthentification ) {
         m_ui->customUsername->setEnabled(false);
         m_ui->customPassword->setEnabled(false);
     } else if (checkedButton == m_ui->customUserPassword) {
         m_ui->customUsername->setEnabled(true);
         m_ui->customPassword->setEnabled(true);
     }
 }
 
 void SetupServer::applySettings()
 {
   m_folderArchiveSettingPage->writeSettings();
   m_shouldClearCache = ( m_parentResource->settings()->imapServer() != m_ui->imapServer->text() )
                     || ( m_parentResource->settings()->userName() != m_ui->userName->text() );
 
   m_parentResource->setName( m_ui->accountName->text() );
 
   m_parentResource->settings()->setImapServer( m_ui->imapServer->text() );
   m_parentResource->settings()->setImapPort( m_ui->portSpin->value() );
   m_parentResource->settings()->setUserName( m_ui->userName->text() );
   QString encryption;
   switch ( m_ui->safeImapGroup->checkedId() ) {
   case KIMAP::LoginJob::Unencrypted :
     encryption = QLatin1String("None");
     break;
   case KIMAP::LoginJob::AnySslVersion:
     encryption = QLatin1String("SSL");
     break;
   case KIMAP::LoginJob::TlsV1:
     encryption = QLatin1String("STARTTLS");
     break;
   default:
     kFatal() << "Shouldn't happen";
   }
   m_parentResource->settings()->setSafety( encryption );
   MailTransport::Transport::EnumAuthenticationType::type authtype = getCurrentAuthMode( m_ui->authenticationCombo );
   kDebug() << "saving IMAP auth mode: " << authenticationModeString( authtype );
   m_parentResource->settings()->setAuthentication( authtype );
   m_parentResource->settings()->setPassword( m_ui->password->text() );
   m_parentResource->settings()->setSubscriptionEnabled( m_ui->subscriptionEnabled->isChecked() );
   m_parentResource->settings()->setIntervalCheckTime( m_ui->checkInterval->value() );
   m_parentResource->settings()->setDisconnectedModeEnabled( m_ui->disconnectedModeEnabled->isChecked() );
 
   m_parentResource->settings()->setSieveSupport( m_ui->managesieveCheck->isChecked() );
   m_parentResource->settings()->setSieveReuseConfig( m_ui->sameConfigCheck->isChecked() );
   m_parentResource->settings()->setSievePort( m_ui->sievePortSpin->value() );
-  m_parentResource->settings()->setSieveAlternateUrl( m_ui->alternateURL->text() );
+  if (!m_ui->alternateURL->text().isEmpty()) {
+    QRegExp sieveurl(QLatin1String("(sieve://)?([A-Za-z0-9-_.]+)(:[0-9]+)?((/|\\?).*)?"));
+    sieveurl.exactMatch(m_ui->alternateURL->text());
+    QString server = sieveurl.cap(2);
+    QString port = sieveurl.cap(3);
+    QString localPart = sieveurl.cap(4);
+    if (port.isEmpty()) {
+        port = QLatin1String(":4190");
+    }
+    m_parentResource->settings()->setSieveAlternateUrl(QLatin1String("sieve://")+server+port+localPart);
+  } else {
+    m_parentResource->settings()->setSieveAlternateUrl(QString());
+  }
   m_parentResource->settings()->setSieveVacationFilename( m_vacationFileName );
 
   m_parentResource->settings()->setTrashCollection( m_ui->folderRequester->collection().id() );
   Akonadi::Collection trash = m_ui->folderRequester->collection();
   Akonadi::SpecialMailCollections::self()->registerCollection(Akonadi::SpecialMailCollections::Trash, trash);
   Akonadi::EntityDisplayAttribute *attribute =  trash.attribute<Akonadi::EntityDisplayAttribute>( Akonadi::Entity::AddIfMissing );
   attribute->setIconName( QLatin1String( "user-trash" ) );
   new Akonadi::CollectionModifyJob( trash );
   if (mOldTrash != trash) {
       Akonadi::SpecialMailCollections::self()->unregisterCollection(mOldTrash);
   }
 
   m_parentResource->settings()->setAutomaticExpungeEnabled( m_ui->autoExpungeCheck->isChecked() );
   m_parentResource->settings()->setUseDefaultIdentity( m_ui->useDefaultIdentityCheck->isChecked() );
 
   if ( !m_ui->useDefaultIdentityCheck->isChecked() )
     m_parentResource->settings()->setAccountIdentity( m_identityCombobox->currentIdentity() );
 
   m_parentResource->settings()->setIntervalCheckEnabled( m_ui->enableMailCheckBox->isChecked() );
   if ( m_ui->enableMailCheckBox->isChecked() )
     m_parentResource->settings()->setIntervalCheckTime( m_ui->checkInterval->value() );
 
   m_parentResource->settings()->setSieveCustomUsername(m_ui->customUsername->text());
 
   QAbstractButton *checkedButton = m_ui->customSieveGroup->checkedButton();
 
   if (checkedButton == m_ui->imapUserPassword) {
       m_parentResource->settings()->setSieveCustomAuthentification(QLatin1String("ImapUserPassword"));
   } else if (checkedButton == m_ui->noAuthentification) {
       m_parentResource->settings()->setSieveCustomAuthentification(QLatin1String("NoAuthentification"));
   } else if (checkedButton == m_ui->customUserPassword) {
       m_parentResource->settings()->setSieveCustomAuthentification(QLatin1String("CustomUserPassword"));
   }
 
   m_parentResource->settings()->setSieveCustomPassword( m_ui->customPassword->text() );
 
   m_parentResource->settings()->writeConfig();
   kDebug() << "wrote" << m_ui->imapServer->text() << m_ui->userName->text() << m_ui->safeImapGroup->checkedId();
 
   if ( m_oldResourceName != m_ui->accountName->text() && !m_ui->accountName->text().isEmpty() ) {
     m_parentResource->settings()->renameRootCollection( m_ui->accountName->text() );
   }
 }
 
 void SetupServer::readSettings()
 {
   m_folderArchiveSettingPage->loadSettings();
   m_ui->accountName->setText( m_parentResource->name() );
   m_oldResourceName = m_ui->accountName->text();
 
   KUser* currentUser = new KUser();
   KEMailSettings esetting;
 
   m_ui->imapServer->setText(
     !m_parentResource->settings()->imapServer().isEmpty() ? m_parentResource->settings()->imapServer() :
     esetting.getSetting( KEMailSettings::InServer ) );
 
   m_ui->portSpin->setValue( m_parentResource->settings()->imapPort() );
 
   m_ui->userName->setText(
     !m_parentResource->settings()->userName().isEmpty() ? m_parentResource->settings()->userName() :
     currentUser->loginName() );
 
   const QString safety = m_parentResource->settings()->safety();
   int i = 0;
   if ( safety == QLatin1String( "SSL" ) )
     i = KIMAP::LoginJob::AnySslVersion;
   else if ( safety == QLatin1String( "STARTTLS" ) )
     i = KIMAP::LoginJob::TlsV1;
   else
     i = KIMAP::LoginJob::Unencrypted;
 
   QAbstractButton* safetyButton = m_ui->safeImapGroup->button( i );
   if ( safetyButton )
       safetyButton->setChecked( true );
 
   populateDefaultAuthenticationOptions();
   i = m_parentResource->settings()->authentication();
   kDebug() << "read IMAP auth mode: " << authenticationModeString( (MailTransport::Transport::EnumAuthenticationType::type) i );
   setCurrentAuthMode( m_ui->authenticationCombo, (MailTransport::Transport::EnumAuthenticationType::type) i );
 
   bool rejected = false;
   const QString password = m_parentResource->settings()->password( &rejected );
   if ( rejected ) {
     m_ui->password->setEnabled( false );
     KMessageBox::information( 0, i18n( "Could not access KWallet. "
                                        "If you want to store the password permanently then you have to "
                                        "activate it. If you do not "
                                        "want to use KWallet, check the box below, but note that you will be "
                                        "prompted for your password when needed." ),
                               i18n( "Do not use KWallet" ), QLatin1String("warning_kwallet_disabled") );
   } else {
     m_ui->password->insert( password );
   }
 
   m_ui->subscriptionEnabled->setChecked( m_parentResource->settings()->subscriptionEnabled() );
 
   m_ui->checkInterval->setValue( m_parentResource->settings()->intervalCheckTime() );
   m_ui->disconnectedModeEnabled->setChecked( m_parentResource->settings()->disconnectedModeEnabled() );
 
   m_ui->managesieveCheck->setChecked( m_parentResource->settings()->sieveSupport() );
   m_ui->sameConfigCheck->setChecked( m_parentResource->settings()->sieveReuseConfig() );
   m_ui->sievePortSpin->setValue( m_parentResource->settings()->sievePort() );
   m_ui->alternateURL->setText( m_parentResource->settings()->sieveAlternateUrl() );
   m_vacationFileName = m_parentResource->settings()->sieveVacationFilename();
 
 
   Akonadi::Collection trashCollection( m_parentResource->settings()->trashCollection() );
   if ( trashCollection.isValid() ) {
     Akonadi::CollectionFetchJob *fetchJob = new Akonadi::CollectionFetchJob( trashCollection,Akonadi::CollectionFetchJob::Base,this );
     connect( fetchJob, SIGNAL(collectionsReceived(Akonadi::Collection::List)),
              this, SLOT(targetCollectionReceived(Akonadi::Collection::List)) );
   } else {
     Akonadi::SpecialMailCollectionsRequestJob *requestJob = new Akonadi::SpecialMailCollectionsRequestJob( this );
     connect ( requestJob, SIGNAL(result(KJob*)),
               this, SLOT(localFolderRequestJobFinished(KJob*)) );
     requestJob->requestDefaultCollection( Akonadi::SpecialMailCollections::Trash );
     requestJob->start();
   }
 
   m_ui->useDefaultIdentityCheck->setChecked( m_parentResource->settings()->useDefaultIdentity() );
   if ( !m_ui->useDefaultIdentityCheck->isChecked() )
     m_identityCombobox->setCurrentIdentity( m_parentResource->settings()->accountIdentity() );
 
   m_ui->enableMailCheckBox->setChecked( m_parentResource->settings()->intervalCheckEnabled() );
   if ( m_ui->enableMailCheckBox->isChecked() )
     m_ui->checkInterval->setValue( m_parentResource->settings()->intervalCheckTime() );
   else
     m_ui->checkInterval->setEnabled( false );
 
   m_ui->autoExpungeCheck->setChecked( m_parentResource->settings()->automaticExpungeEnabled() );
 
   if ( m_vacationFileName.isEmpty() )
     m_vacationFileName = QLatin1String("kmail-vacation.siv");
 
   m_ui->customUsername->setText(m_parentResource->settings()->sieveCustomUsername());
 
   m_ui->customPassword->setText(m_parentResource->settings()->sieveCustomPassword());
 
 
   const QString sieverCustomAuth(m_parentResource->settings()->sieveCustomAuthentification());
   if (sieverCustomAuth == QLatin1String("ImapUserPassword"))
       m_ui->imapUserPassword->setChecked(true);
   else if (sieverCustomAuth == QLatin1String("NoAuthentification"))
       m_ui->noAuthentification->setChecked(true);
   else if (sieverCustomAuth == QLatin1String("CustomUserPassword"))
       m_ui->customUserPassword->setChecked(true);
 
   delete currentUser;
 }
 
 void SetupServer::slotTest()
 {
   kDebug() << m_ui->imapServer->text();
 
   m_ui->testButton->setEnabled( false );
   m_ui->safeImap->setEnabled( false );
   m_ui->authenticationCombo->setEnabled( false );
 
   m_ui->testInfo->clear();
   m_ui->testInfo->hide();
 
   delete m_serverTest;
   m_serverTest = new MailTransport::ServerTest( this );
 #ifndef QT_NO_CURSOR
   qApp->setOverrideCursor( Qt::BusyCursor );
 #endif
 
   const QString server = m_ui->imapServer->text();
   const int port = m_ui->portSpin->value();
   kDebug() << "server: " << server << "port: " << port;
 
   m_serverTest->setServer( server );
 
   if ( port != 143 && port != 993 ) {
     m_serverTest->setPort( MailTransport::Transport::EnumEncryption::None, port );
     m_serverTest->setPort( MailTransport::Transport::EnumEncryption::SSL, port );
   }
 
   m_serverTest->setProtocol( QLatin1String("imap") );
   m_serverTest->setProgressBar( m_ui->testProgress );
   connect( m_serverTest, SIGNAL(finished(QList<int>)),
            SLOT(slotFinished(QList<int>)) );
   enableButtonOk( false );
   m_serverTest->start();
 }
 
 void SetupServer::slotFinished( const QList<int> &testResult )
 {
   kDebug() << testResult;
 
 #ifndef QT_NO_CURSOR
   qApp->restoreOverrideCursor();
 #endif
   enableButtonOk( true );
 
   using namespace MailTransport;
 
   if ( !m_serverTest->isNormalPossible() && !m_serverTest->isSecurePossible() )
     KMessageBox::sorry( this, i18n( "Unable to connect to the server, please verify the server address." ) );
 
   m_ui->testInfo->show();
 
   m_ui->sslRadio->setEnabled( testResult.contains( Transport::EnumEncryption::SSL ) );
   m_ui->tlsRadio->setEnabled( testResult.contains( Transport::EnumEncryption::TLS ) );
   m_ui->noRadio->setEnabled( testResult.contains( Transport::EnumEncryption::None ) );
 
   QString text;
   if ( testResult.contains( Transport::EnumEncryption::TLS ) ) {
     m_ui->tlsRadio->setChecked( true );
     text = i18n( "<qt><b>TLS is supported and recommended.</b></qt>" );
   } else if ( testResult.contains( Transport::EnumEncryption::SSL ) ) {
     m_ui->sslRadio->setChecked( true );
     text = i18n( "<qt><b>SSL is supported and recommended.</b></qt>" );
   } else if ( testResult.contains( Transport::EnumEncryption::None ) ) {
     m_ui->noRadio->setChecked( true );
     text = i18n( "<qt><b>No security is supported. It is not "
                  "recommended to connect to this server.</b></qt>" );
   } else {
     text = i18n( "<qt><b>It is not possible to use this server.</b></qt>" );
   }
   m_ui->testInfo->setText( text );
 
   m_ui->testButton->setEnabled( true );
   m_ui->safeImap->setEnabled( true );
   m_ui->authenticationCombo->setEnabled( true );
   slotEncryptionRadioChanged();
   slotSafetyChanged();
 }
 
 void SetupServer::slotTestChanged()
 {
   delete m_serverTest;
   m_serverTest = 0;
   slotSafetyChanged();
 
   // do not use imapConnectionPossible, as the data is not yet saved.
   m_ui->testButton->setEnabled( true /* TODO Global::connectionPossible() ||
                                         m_ui->imapServer->text() == "localhost"*/ );
 }
 
 void SetupServer::slotEnableWidgets()
 {
   const bool haveSieve = m_ui->managesieveCheck->isChecked();
   const bool reuseConfig = m_ui->sameConfigCheck->isChecked();
 
   m_ui->sameConfigCheck->setEnabled( haveSieve );
   m_ui->sievePortSpin->setEnabled( haveSieve && reuseConfig );
   m_ui->alternateURL->setEnabled( haveSieve && !reuseConfig );
   m_ui->authentification->setEnabled( haveSieve && !reuseConfig );
 }
 
 void SetupServer::slotComplete()
 {
   const bool ok =  !m_ui->imapServer->text().isEmpty() && !m_ui->userName->text().isEmpty();
   button( KDialog::Ok )->setEnabled( ok );
 }
 
 void SetupServer::slotSafetyChanged()
 {
   if ( m_serverTest == 0 ) {
     kDebug() << "serverTest null";
     m_ui->noRadio->setEnabled( true );
     m_ui->sslRadio->setEnabled( true );
     m_ui->tlsRadio->setEnabled( true );
 
     m_ui->authenticationCombo->setEnabled( true );
     return;
   }
 
   QList<int> protocols;
 
   switch ( m_ui->safeImapGroup->checkedId() ) {
   case KIMAP::LoginJob::Unencrypted :
     kDebug() << "safeImapGroup: unencrypted";
     protocols = m_serverTest->normalProtocols();
     break;
   case KIMAP::LoginJob::AnySslVersion:
     protocols = m_serverTest->secureProtocols();
     kDebug() << "safeImapGroup: SSL";
     break;
   case KIMAP::LoginJob::TlsV1:
     protocols = m_serverTest->tlsProtocols();
     kDebug() << "safeImapGroup: starttls";
     break;
   default:
     kFatal() << "Shouldn't happen";
   }
 
   m_ui->authenticationCombo->clear();
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::CLEAR );
   foreach ( int prot, protocols ) {
     addAuthenticationItem( m_ui->authenticationCombo, (MailTransport::Transport::EnumAuthenticationType::type) prot );
   }
   if ( protocols.size() > 0 )
     setCurrentAuthMode( m_ui->authenticationCombo, (MailTransport::Transport::EnumAuthenticationType::type) protocols.first() );
   else
     kDebug() << "no authmodes found";
 }
 
 void SetupServer::slotManageSubscriptions()
 {
   kDebug() << "manage subscripts";
   ImapAccount account;
 
   account.setServer( m_ui->imapServer->text() );
   account.setPort( m_ui->portSpin->value() );
 
   account.setUserName( m_ui->userName->text() );
   account.setSubscriptionEnabled( m_ui->subscriptionEnabled->isChecked() );
 
   account.setEncryptionMode(
     static_cast<KIMAP::LoginJob::EncryptionMode>( m_ui->safeImapGroup->checkedId() )
   );
 
   account.setAuthenticationMode( Settings::mapTransportAuthToKimap( getCurrentAuthMode( m_ui->authenticationCombo ) ) );
 
   QPointer<SubscriptionDialog> subscriptions = new SubscriptionDialog( this );
   subscriptions->setCaption(  i18n( "Serverside Subscription" ) );
   subscriptions->setWindowIcon( KIcon( QLatin1String("network-server") ) );
   subscriptions->connectAccount( account, m_ui->password->text() );
   m_subscriptionsChanged = subscriptions->isSubscriptionChanged();
 
   subscriptions->exec();
   delete subscriptions;
 
   m_ui->subscriptionEnabled->setChecked( account.isSubscriptionEnabled() );
 }
 
 void SetupServer::slotShowServerInfo()
 {
   ServerInfoDialog *dialog = new ServerInfoDialog(m_parentResource, this);
   dialog->show();
 }
 
 void SetupServer::targetCollectionReceived( const Akonadi::Collection::List &collections )
 {
   m_ui->folderRequester->setCollection( collections.first() );
   mOldTrash = collections.first();
 }
 
 void SetupServer::localFolderRequestJobFinished( KJob *job )
 {
   if ( !job->error() ) {
     Akonadi::Collection targetCollection = Akonadi::SpecialMailCollections::self()->defaultCollection( Akonadi::SpecialMailCollections::Trash );
     Q_ASSERT( targetCollection.isValid() );
      m_ui->folderRequester->setCollection( targetCollection );
      mOldTrash = targetCollection;
   }
 }
 
 void SetupServer::populateDefaultAuthenticationOptions()
 {
   m_ui->authenticationCombo->clear();
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::CLEAR);
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::LOGIN );
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::PLAIN );
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::CRAM_MD5 );
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::DIGEST_MD5 );
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::NTLM );
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::GSSAPI );
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::ANONYMOUS );
 }
 
 
 
 
diff --git a/resources/imap/setupserver.h b/resources/imap/setupserver.h
index c5650f35a..19384744a 100644
--- a/resources/imap/setupserver.h
+++ b/resources/imap/setupserver.h
@@ -1,113 +1,114 @@
 /* This file is part of the KDE project
    Copyright (C) 2010 Casey Link <unnamedrambler@gmail.com>
    Copyright (c) 2009-2010 Klaralvdalens Datakonsult AB, a KDAB Group company <info@kdab.net>
    Copyright (C) 2009 Kevin Ottens <ervin@kde.org>
    Copyright (C) 2006-2008 Omat Holding B.V. <info@omat.nl>
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #ifndef SETUPSERVER_H
 #define SETUPSERVER_H
 
 #include <klineedit.h>
 #include <kdialog.h>
 #include <akonadi/collection.h>
 #include <KJob>
 
 #include <QRegExpValidator>
 
 namespace Ui
 {
 class SetupServerView;
 }
 
 namespace MailTransport
 {
 class ServerTest;
 }
 namespace KPIMIdentities
 {
 class IdentityCombo;
 class IdentityManager;
 }
 class FolderArchiveSettingPage;
 class ImapResourceBase;
 
 /**
  * @class SetupServer
  * These contain the account settings
  * @author Tom Albers <tomalbers@kde.nl>
  */
 class SetupServer : public KDialog
 {
   Q_OBJECT
 
 public:
   /**
    * Constructor
    * @param parentResource The resource this dialog belongs to
    * @param parent Parent WId
    */
   SetupServer( ImapResourceBase *parentResource, WId parent );
 
   /**
    * Destructor
    */
   ~SetupServer();
 
   bool shouldClearCache() const;
 
 private slots:
   /**
    * Call this if you want the settings saved from this page.
    */
   void applySettings();
   void slotIdentityCheckboxChanged();
   void slotMailCheckboxChanged();
   void slotEncryptionRadioChanged();
   void slotSubcriptionCheckboxChanged();
   void slotShowServerInfo();
 private:
   void readSettings();
   void populateDefaultAuthenticationOptions();
 
   ImapResourceBase *m_parentResource;
   Ui::SetupServerView *m_ui;
   MailTransport::ServerTest *m_serverTest;
   bool m_subscriptionsChanged;
   bool m_shouldClearCache;
   QString m_vacationFileName;
   KPIMIdentities::IdentityManager *m_identityManager;
   KPIMIdentities::IdentityCombo *m_identityCombobox;
   QString m_oldResourceName;
   QRegExpValidator mValidator;
+  QRegExpValidator mSieveUrlValidator;
   Akonadi::Collection mOldTrash;
   FolderArchiveSettingPage *m_folderArchiveSettingPage;
 
 private slots:
   void slotTest();
   void slotFinished(const QList<int> &testResult );
   void slotCustomSieveChanged();
 
   void slotTestChanged();
   void slotComplete();
   void slotSafetyChanged();
   void slotManageSubscriptions();
   void slotEnableWidgets();
   void targetCollectionReceived(const Akonadi::Collection::List &collections );
   void localFolderRequestJobFinished( KJob *job );
 };
 
 #endif
diff --git a/resources/imap/setupserverview_desktop.ui b/resources/imap/setupserverview_desktop.ui
index 92a35abf0..8e15869dd 100644
--- a/resources/imap/setupserverview_desktop.ui
+++ b/resources/imap/setupserverview_desktop.ui
@@ -1,653 +1,656 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SetupServerView</class>
  <widget class="QWidget" name="SetupServerView">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>454</width>
     <height>518</height>
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_6">
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
        <string>General</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
           <string>Account Information</string>
          </property>
          <layout class="QFormLayout" name="formLayout_2">
           <item row="0" column="0">
            <widget class="QLabel" name="label_8">
             <property name="text">
              <string>Account Name:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="KLineEdit" name="accountName">
               <property name="trapReturnKey">
                <bool>true</bool>
               </property>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label">
             <property name="whatsThis">
              <string>Indicate the IMAP server. If you want to connect to a non-standard port for a specific encryption scheme, you can add &quot;:port&quot; to indicate that. For example: &quot;imap.foo.com:144&quot;.</string>
             </property>
             <property name="text">
              <string>IMAP Server:</string>
             </property>
             <property name="buddy">
              <cstring>imapServer</cstring>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="KLineEdit" name="imapServer">
               <property name="trapReturnKey">
                <bool>true</bool>
               </property>
            </widget>
           </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_2">
             <property name="whatsThis">
              <string>The username.</string>
             </property>
             <property name="text">
              <string>Username:</string>
             </property>
             <property name="buddy">
              <cstring>userName</cstring>
             </property>
            </widget>
           </item>
           <item row="2" column="1">
            <widget class="KLineEdit" name="userName">
               <property name="trapReturnKey">
                <bool>true</bool>
               </property>
            </widget>
           </item>
           <item row="3" column="0">
            <widget class="QLabel" name="label_3">
             <property name="whatsThis">
              <string>The password.</string>
             </property>
             <property name="text">
              <string>Password:</string>
             </property>
             <property name="buddy">
              <cstring>password</cstring>
             </property>
            </widget>
           </item>
           <item row="3" column="1">
            <widget class="KLineEdit" name="password">
             <property name="echoMode">
              <enum>QLineEdit::Password</enum>
             </property>
               <property name="trapReturnKey">
                <bool>true</bool>
               </property>
 
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="checkOptions">
          <property name="title">
           <string>Mail Checking Options</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_6">
           <item>
            <widget class="QCheckBox" name="disconnectedModeEnabled">
             <property name="text">
              <string>&amp;Download all messages for offline use</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="enableMailCheckBox">
             <property name="text">
              <string>Enable &amp;interval mail checking</string>
             </property>
            </widget>
           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_1">
             <item>
              <widget class="QLabel" name="label_7">
               <property name="text">
                <string>Check mail interval:</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="KIntNumInput" name="checkInterval">
               <property name="value">
                <number>1</number>
               </property>
               <property name="minimum">
                <number>0</number>
               </property>
               <property name="suffix">
                <string/>
               </property>
               <property name="prefix">
                <string/>
               </property>
              </widget>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
        <string>Filtering</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <widget class="QCheckBox" name="managesieveCheck">
          <property name="text">
           <string>Server supports Sieve</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="sameConfigCheck">
          <property name="text">
           <string>Reuse host and login configuration</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QLabel" name="label_14">
          <property name="text">
           <string>The server port changed when ManageSieve turned into a full RFC Standard. Old server implementations still use port 2000, while newer standard conform server can only be accessed via port 4190.</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
           <widget class="QLabel" name="label_5">
            <property name="text">
             <string>Managesieve port:</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="KIntSpinBox" name="sievePortSpin">
            <property name="maximum">
             <number>65535</number>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <item>
           <widget class="QLabel" name="label_6">
            <property name="text">
             <string>Alternate URL:</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="KLineEdit" name="alternateURL">
+              <property name="placeholderText">
+               <string>sieve://server:port</string>
+              </property>
               <property name="trapReturnKey">
                <bool>true</bool>
               </property>
 
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <widget class="QGroupBox" name="authentification">
          <property name="title">
           <string>Authentication</string>
          </property>
          <layout class="QGridLayout" name="gridLayout">
           <item row="5" column="1">
            <widget class="KLineEdit" name="customPassword">
             <property name="echoMode">
              <enum>QLineEdit::Password</enum>
             </property>
               <property name="trapReturnKey">
                <bool>true</bool>
               </property>
            </widget>
           </item>
           <item row="1" column="0" colspan="2">
            <widget class="QRadioButton" name="noAuthentification">
             <property name="text">
              <string>No authentication</string>
             </property>
             <attribute name="buttonGroup">
              <string notr="true">customSieveGroup</string>
             </attribute>
            </widget>
           </item>
           <item row="5" column="0">
            <widget class="QLabel" name="label_13">
             <property name="text">
              <string>Password:</string>
             </property>
            </widget>
           </item>
           <item row="4" column="0">
            <widget class="QLabel" name="label_12">
             <property name="text">
              <string>Username:</string>
             </property>
            </widget>
           </item>
           <item row="3" column="0" colspan="2">
            <widget class="QRadioButton" name="customUserPassword">
             <property name="text">
              <string>Username and Password</string>
             </property>
             <attribute name="buttonGroup">
              <string notr="true">customSieveGroup</string>
             </attribute>
            </widget>
           </item>
           <item row="4" column="1">
            <widget class="KLineEdit" name="customUsername">
               <property name="trapReturnKey">
               <bool>true</bool>
               </property>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QRadioButton" name="imapUserPassword">
             <property name="text">
              <string>IMAP Username and Password</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
             <attribute name="buttonGroup">
              <string notr="true">customSieveGroup</string>
             </attribute>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_4">
       <attribute name="title">
        <string>Advanced</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
           <string>IMAP Settings</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_5">
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_8">
             <item>
              <widget class="QCheckBox" name="subscriptionEnabled">
               <property name="text">
                <string>Enable server-side subscriptions</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="KPushButton" name="subscriptionButton">
               <property name="enabled">
                <bool>false</bool>
               </property>
               <property name="text">
                <string>Serverside Subscription...</string>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item>
            <widget class="QCheckBox" name="autoExpungeCheck">
             <property name="text">
              <string>Automaticall&amp;y compact folders (expunges deleted messages)</string>
             </property>
            </widget>
           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_7">
             <item>
              <widget class="QLabel" name="label_11">
               <property name="text">
                <string>Trash folder:</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="Akonadi::CollectionRequester" name="folderRequester"/>
             </item>
            </layout>
           </item>
           <item>
            <widget class="QGroupBox" name="identityBox">
             <property name="title">
              <string>Identity Settings</string>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_7">
              <item>
               <widget class="QCheckBox" name="useDefaultIdentityCheck">
                <property name="toolTip">
                 <string>Use the default identity for this account</string>
                </property>
                <property name="text">
                 <string>Use &amp;default identity</string>
                </property>
               </widget>
              </item>
              <item>
               <layout class="QHBoxLayout" name="identityLayout">
                <item>
                 <widget class="QLabel" name="identityLabel">
                  <property name="toolTip">
                   <string>Select the KMail identity used for this account</string>
                  </property>
                  <property name="text">
                   <string>Identity:</string>
                  </property>
                 </widget>
                </item>
               </layout>
              </item>
             </layout>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="safeImap">
          <property name="whatsThis">
           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'HandelGotDLig'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-weight:600;&quot;&gt;SSL/TLS&lt;/span&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt; is safe IMAP over port 993;&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-weight:600;&quot;&gt;STARTTLS&lt;/span&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt; will operate on port 143 and switch to a secure connection directly after connecting;&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-weight:600;&quot;&gt;None&lt;/span&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt; will connect to port 143 but not switch to a secure connection. This setting is not recommended.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="title">
           <string>Connection Settings</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
            <widget class="KPushButton" name="testButton">
             <property name="text">
              <string>Auto Detect</string>
             </property>
            </widget>
           </item>
           <item>
            <layout class="QFormLayout" name="formLayout">
             <property name="fieldGrowthPolicy">
              <enum>QFormLayout::ExpandingFieldsGrow</enum>
             </property>
             <item row="1" column="0">
              <widget class="QLabel" name="label_9">
               <property name="text">
                <string>Encryption:</string>
               </property>
              </widget>
             </item>
             <item row="1" column="1">
              <layout class="QHBoxLayout" name="horizontalLayout">
               <item>
                <widget class="QRadioButton" name="noRadio">
                 <property name="text">
                  <string>None</string>
                 </property>
                 <property name="checked">
                  <bool>true</bool>
                 </property>
                 <attribute name="buttonGroup">
                  <string notr="true">safeImapGroup</string>
                 </attribute>
                </widget>
               </item>
               <item>
                <widget class="QRadioButton" name="sslRadio">
                 <property name="text">
                  <string>SSL/TLS</string>
                 </property>
                 <attribute name="buttonGroup">
                  <string notr="true">safeImapGroup</string>
                 </attribute>
                </widget>
               </item>
               <item>
                <widget class="QRadioButton" name="tlsRadio">
                 <property name="text">
                  <string>STARTTLS</string>
                 </property>
                 <attribute name="buttonGroup">
                  <string notr="true">safeImapGroup</string>
                 </attribute>
                </widget>
               </item>
              </layout>
             </item>
             <item row="2" column="0">
              <widget class="QLabel" name="label_4">
               <property name="text">
                <string>Port:</string>
               </property>
              </widget>
             </item>
             <item row="2" column="1">
              <widget class="QSpinBox" name="portSpin">
               <property name="minimum">
                <number>1</number>
               </property>
               <property name="maximum">
                <number>65534</number>
               </property>
               <property name="value">
                <number>143</number>
               </property>
              </widget>
             </item>
             <item row="3" column="0">
              <widget class="QLabel" name="label_10">
               <property name="text">
                <string>Authentication:</string>
               </property>
              </widget>
             </item>
             <item row="3" column="1">
              <widget class="QComboBox" name="authenticationCombo">
               <item>
                <property name="text">
                 <string>Clear text</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>LOGIN</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>PLAIN</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>CRAM-MD5</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>DIGEST-MD5</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>NTLM</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>GSSAPI</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Anonymous</string>
                </property>
               </item>
              </widget>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QLabel" name="testInfo">
          <property name="font">
           <font>
            <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
          <property name="text">
           <string>Empty</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QProgressBar" name="testProgress">
          <property name="value">
           <number>24</number>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="showServerInfo">
          <property name="text">
           <string>Server Info</string>
          </property>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KPushButton</class>
    <extends>QPushButton</extends>
    <header>kpushbutton.h</header>
   </customwidget>
   <customwidget>
    <class>KIntSpinBox</class>
    <extends>QSpinBox</extends>
    <header>knuminput.h</header>
   </customwidget>
   <customwidget>
    <class>KIntNumInput</class>
    <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
   <customwidget>
    <class>Akonadi::CollectionRequester</class>
    <extends>QFrame</extends>
    <header>Akonadi/CollectionRequester</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
  <buttongroups>
   <buttongroup name="customSieveGroup"/>
   <buttongroup name="safeImapGroup"/>
  </buttongroups>
 </ui>
diff --git a/resources/kolab/setupserver.cpp b/resources/kolab/setupserver.cpp
index 8ba30609c..da20e5b29 100644
--- a/resources/kolab/setupserver.cpp
+++ b/resources/kolab/setupserver.cpp
@@ -1,667 +1,684 @@
 /* This file is part of the KDE project
 
    Copyright (c) 2010 Klarälvdalens Datakonsult AB,
                       a KDAB Group company <info@kdab.com>
    Author: Kevin Ottens <kevin@kdab.com>
 
    Copyright (C) 2010 Casey Link <unnamedrambler@gmail.com>
    Copyright (c) 2009-2010 Klaralvdalens Datakonsult AB, a KDAB Group company <info@kdab.net>
    Copyright (C) 2009 Kevin Ottens <ervin@kde.org>
    Copyright (C) 2006-2008 Omat Holding B.V. <info@omat.nl>
    Copyright (C) 2006 Frode M. Døving <frode@lnix.net>
 
    Original copied from showfoto:
     Copyright 2005 by Gilles Caulier <caulier.gilles@free.fr>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #include "setupserver.h"
 #include "settings.h"
 #include "imapresource.h"
 #include "serverinfodialog.h"
 #include "resources/folderarchivesettings/folderarchivesettingpage.h"
 
 
 #include <mailtransport/transport.h>
 #include <mailtransport/servertest.h>
 
 #include <kmime/kmime_message.h>
 
 #include <akonadi/collectionfetchjob.h>
 #include <akonadi/kmime/specialmailcollections.h>
 #include <akonadi/kmime/specialmailcollectionsrequestjob.h>
 #include <akonadi/resourcesettings.h>
 #include <akonadi/entitydisplayattribute.h>
 #include <Akonadi/CollectionModifyJob>
 #include <kemailsettings.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
 #include <kuser.h>
 #ifndef IMAPRESOURCE_NO_SOLID
 #include <solid/networking.h>
 #endif
 
 #include <kpimidentities/identitymanager.h>
 #include <kpimidentities/identitycombo.h>
 
 #include "imapaccount.h"
 #include "subscriptiondialog.h"
 
 #ifdef KDEPIM_MOBILE_UI
 #include "ui_setupserverview_mobile.h"
 #else
 #include "ui_setupserverview_desktop.h"
 #endif
 #include "ui_serverinfo.h"
 
 /** static helper functions **/
 static QString authenticationModeString( MailTransport::Transport::EnumAuthenticationType::type mode )
 {
   switch ( mode ) {
     case  MailTransport::Transport::EnumAuthenticationType::LOGIN:
       return QLatin1String("LOGIN");
     case MailTransport::Transport::EnumAuthenticationType::PLAIN:
       return QLatin1String("PLAIN");
     case MailTransport::Transport::EnumAuthenticationType::CRAM_MD5:
       return QLatin1String("CRAM-MD5");
     case MailTransport::Transport::EnumAuthenticationType::DIGEST_MD5:
       return QLatin1String("DIGEST-MD5");
     case MailTransport::Transport::EnumAuthenticationType::GSSAPI:
       return QLatin1String("GSSAPI");
     case MailTransport::Transport::EnumAuthenticationType::NTLM:
       return QLatin1String("NTLM");
     case MailTransport::Transport::EnumAuthenticationType::CLEAR:
       return i18nc( "Authentication method", "Clear text" );
     case MailTransport::Transport::EnumAuthenticationType::ANONYMOUS:
       return i18nc( "Authentication method", "Anonymous" );
     default:
       break;
   }
   return QString();
 }
 
 static void setCurrentAuthMode( QComboBox* authCombo, MailTransport::Transport::EnumAuthenticationType::type authtype )
 {
   kDebug() << "setting authcombo: " << authenticationModeString( authtype );
   int index = authCombo->findData( authtype );
   if ( index == -1 )
     kWarning() << "desired authmode not in the combo";
   kDebug() << "found corresponding index: " << index << "with data" << authenticationModeString( (MailTransport::Transport::EnumAuthenticationType::type) authCombo->itemData( index ).toInt() );
   authCombo->setCurrentIndex( index );
   MailTransport::Transport::EnumAuthenticationType::type t = (MailTransport::Transport::EnumAuthenticationType::type) authCombo->itemData( authCombo->currentIndex() ).toInt();
   kDebug() << "selected auth mode:" << authenticationModeString( t );
   Q_ASSERT( t == authtype );
 }
 
 static MailTransport::Transport::EnumAuthenticationType::type getCurrentAuthMode( QComboBox* authCombo )
 {
   MailTransport::Transport::EnumAuthenticationType::type authtype = (MailTransport::Transport::EnumAuthenticationType::type) authCombo->itemData( authCombo->currentIndex() ).toInt();
   kDebug() << "current auth mode: " << authenticationModeString( authtype );
   return authtype;
 }
 
 static void addAuthenticationItem( QComboBox* authCombo, MailTransport::Transport::EnumAuthenticationType::type authtype )
 {
     kDebug() << "adding auth item " << authenticationModeString( authtype );
     authCombo->addItem( authenticationModeString( authtype ), QVariant( authtype ) );
 }
 
 SetupServer::SetupServer( ImapResourceBase *parentResource, WId parent )
   : KDialog(), m_parentResource( parentResource ), m_ui(new Ui::SetupServerView), m_serverTest(0),
     m_subscriptionsChanged(false), m_shouldClearCache(false), mValidator( this )
 {
   m_parentResource->settings()->setWinId( parent );
   m_ui->setupUi( mainWidget() );
 
   //kolabresource always use disconnected mode
   m_ui->disconnectedModeEnabled->setVisible(false);
 
   m_folderArchiveSettingPage = new FolderArchiveSettingPage(m_parentResource->identifier());
   m_ui->tabWidget->addTab(m_folderArchiveSettingPage, i18n("Folder Archive"));
   m_ui->safeImapGroup->setId( m_ui->noRadio, KIMAP::LoginJob::Unencrypted );
   m_ui->safeImapGroup->setId( m_ui->sslRadio, KIMAP::LoginJob::AnySslVersion );
   m_ui->safeImapGroup->setId( m_ui->tlsRadio, KIMAP::LoginJob::TlsV1 );
 
   connect( m_ui->noRadio, SIGNAL(toggled(bool)),
            this, SLOT(slotSafetyChanged()) );
   connect( m_ui->sslRadio, SIGNAL(toggled(bool)),
            this, SLOT(slotSafetyChanged()) );
   connect( m_ui->tlsRadio, SIGNAL(toggled(bool)),
            this, SLOT(slotSafetyChanged()) );
 
   m_ui->testInfo->hide();
   m_ui->testProgress->hide();
   m_ui->accountName->setFocus();
   m_ui->checkInterval->setSuffix( ki18np( " minute", " minutes" ) );
   m_ui->checkInterval->setRange( Akonadi::ResourceSettings::self()->minimumCheckInterval(), 10000, 1 );
 
   // regex for evaluating a valid server name/ip
   mValidator.setRegExp( QRegExp( QLatin1String("[A-Za-z0-9-_:.]*") ) );
   m_ui->imapServer->setValidator( &mValidator );
 
+  // regex for evaluating a valid sieve url
+  mSieveUrlValidator.setRegExp(QRegExp(QLatin1String("(sieve://)?[A-Za-z0-9-_.]*(:[0-9]+)?((/|\\?).*)?")));
+  m_ui->alternateURL->setValidator(&mSieveUrlValidator);
+
   m_ui->folderRequester->setMimeTypeFilter(
     QStringList() << KMime::Message::mimeType() );
   m_ui->folderRequester->setAccessRightsFilter( Akonadi::Collection::CanChangeItem | Akonadi::Collection::CanCreateItem | Akonadi::Collection::CanDeleteItem );
   m_ui->folderRequester->changeCollectionDialogOptions( Akonadi::CollectionDialog::AllowToCreateNewChildCollection );
   m_identityManager = new KPIMIdentities::IdentityManager( false, this, "mIdentityManager" );
   m_identityCombobox = new KPIMIdentities::IdentityCombo( m_identityManager, this );
   m_ui->identityLabel->setBuddy( m_identityCombobox );
   m_ui->identityLayout->addWidget( m_identityCombobox, 1 );
   m_ui->identityLabel->setBuddy( m_identityCombobox );
 
 
   connect( m_ui->testButton, SIGNAL(pressed()), SLOT(slotTest()) );
 
   connect( m_ui->imapServer, SIGNAL(textChanged(QString)),
            SLOT(slotTestChanged()) );
   connect( m_ui->imapServer, SIGNAL(textChanged(QString)),
            SLOT(slotComplete()) );
   connect( m_ui->userName, SIGNAL(textChanged(QString)),
            SLOT(slotComplete()) );
   connect( m_ui->subscriptionEnabled, SIGNAL(toggled(bool)), this, SLOT(slotSubcriptionCheckboxChanged()) );
   connect( m_ui->subscriptionButton, SIGNAL(pressed()), SLOT(slotManageSubscriptions()) );
 
   connect( m_ui->managesieveCheck, SIGNAL(toggled(bool)),
            SLOT(slotEnableWidgets()) );
   connect( m_ui->sameConfigCheck, SIGNAL(toggled(bool)),
            SLOT(slotEnableWidgets()) );
 
 
   connect( m_ui->useDefaultIdentityCheck, SIGNAL(toggled(bool)), this, SLOT(slotIdentityCheckboxChanged()) );
   connect( m_ui->enableMailCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotMailCheckboxChanged()) );
   connect( m_ui->safeImapGroup, SIGNAL(buttonClicked(int)), this, SLOT(slotEncryptionRadioChanged()) );
   connect( m_ui->customSieveGroup, SIGNAL(buttonClicked(int)), this, SLOT(slotCustomSieveChanged()) );
   connect( m_ui->showServerInfo, SIGNAL(pressed()), this, SLOT(slotShowServerInfo()) );
 
   readSettings();
   slotTestChanged();
   slotComplete();
   slotCustomSieveChanged();
+  slotEnableWidgets();
 #ifndef IMAPRESOURCE_NO_SOLID
   connect( Solid::Networking::notifier(),
            SIGNAL(statusChanged(Solid::Networking::Status)),
            SLOT(slotTestChanged()) );
 #endif
   connect( this, SIGNAL(applyClicked()),
            SLOT(applySettings()) );
   connect( this, SIGNAL(okClicked()),
            SLOT(applySettings()) );
 }
 
 SetupServer::~SetupServer()
 {
   delete m_ui;
 }
 
 bool SetupServer::shouldClearCache() const
 {
   return m_shouldClearCache;
 }
 
 void SetupServer::slotSubcriptionCheckboxChanged()
 {
   m_ui->subscriptionButton->setEnabled( m_ui->subscriptionEnabled->isChecked() );
 }
 
 void SetupServer::slotIdentityCheckboxChanged()
 {
   m_identityCombobox->setEnabled( !m_ui->useDefaultIdentityCheck->isChecked() );
 }
 
 void SetupServer::slotMailCheckboxChanged()
 {
   m_ui->checkInterval->setEnabled( m_ui->enableMailCheckBox->isChecked() );
 }
 
 void SetupServer::slotEncryptionRadioChanged()
 {
   // TODO these really should be defined somewhere else
   switch ( m_ui->safeImapGroup->checkedId() ) {
     case KIMAP::LoginJob::Unencrypted:
     case KIMAP::LoginJob::TlsV1:
       m_ui->portSpin->setValue( 143 );
       break;
     case KIMAP::LoginJob::AnySslVersion:
       m_ui->portSpin->setValue( 993 );
       break;
   default:
     kFatal() << "Shouldn't happen";
   }
 }
 
 void SetupServer::slotCustomSieveChanged()
 {
     QAbstractButton *checkedButton = m_ui->customSieveGroup->checkedButton();
 
     if (checkedButton == m_ui->imapUserPassword ||
             checkedButton == m_ui->noAuthentification ) {
         m_ui->customUsername->setEnabled(false);
         m_ui->customPassword->setEnabled(false);
     } else if (checkedButton == m_ui->customUserPassword) {
         m_ui->customUsername->setEnabled(true);
         m_ui->customPassword->setEnabled(true);
     }
 }
 
 void SetupServer::applySettings()
 {
   m_folderArchiveSettingPage->writeSettings();
   m_shouldClearCache = ( m_parentResource->settings()->imapServer() != m_ui->imapServer->text() )
                     || ( m_parentResource->settings()->userName() != m_ui->userName->text() );
 
   m_parentResource->setName( m_ui->accountName->text() );
 
   m_parentResource->settings()->setImapServer( m_ui->imapServer->text() );
   m_parentResource->settings()->setImapPort( m_ui->portSpin->value() );
   m_parentResource->settings()->setUserName( m_ui->userName->text() );
   QString encryption;
   switch ( m_ui->safeImapGroup->checkedId() ) {
   case KIMAP::LoginJob::Unencrypted :
     encryption = QLatin1String("None");
     break;
   case KIMAP::LoginJob::AnySslVersion:
     encryption = QLatin1String("SSL");
     break;
   case KIMAP::LoginJob::TlsV1:
     encryption = QLatin1String("STARTTLS");
     break;
   default:
     kFatal() << "Shouldn't happen";
   }
   m_parentResource->settings()->setSafety( encryption );
   MailTransport::Transport::EnumAuthenticationType::type authtype = getCurrentAuthMode( m_ui->authenticationCombo );
   kDebug() << "saving IMAP auth mode: " << authenticationModeString( authtype );
   m_parentResource->settings()->setAuthentication( authtype );
   m_parentResource->settings()->setPassword( m_ui->password->text() );
   m_parentResource->settings()->setSubscriptionEnabled( m_ui->subscriptionEnabled->isChecked() );
   m_parentResource->settings()->setIntervalCheckTime( m_ui->checkInterval->value() );
   m_parentResource->settings()->setDisconnectedModeEnabled( m_ui->disconnectedModeEnabled->isChecked() );
 
   m_parentResource->settings()->setSieveSupport( m_ui->managesieveCheck->isChecked() );
   m_parentResource->settings()->setSieveReuseConfig( m_ui->sameConfigCheck->isChecked() );
   m_parentResource->settings()->setSievePort( m_ui->sievePortSpin->value() );
-  m_parentResource->settings()->setSieveAlternateUrl( m_ui->alternateURL->text() );
+  if (!m_ui->alternateURL->text().isEmpty()) {
+    QRegExp sieveurl(QLatin1String("(sieve://)?([A-Za-z0-9-_.]+)(:[0-9]+)?((/|\\?).*)?"));
+    sieveurl.exactMatch(m_ui->alternateURL->text());
+    QString server = sieveurl.cap(2);
+    QString port = sieveurl.cap(3);
+    QString localPart = sieveurl.cap(4);
+    if (port.isEmpty()) {
+        port = QLatin1String(":4190");
+    }
+    m_parentResource->settings()->setSieveAlternateUrl(QLatin1String("sieve://")+server+port+localPart);
+  } else {
+    m_parentResource->settings()->setSieveAlternateUrl(QString());
+  }
   m_parentResource->settings()->setSieveVacationFilename( m_vacationFileName );
 
   m_parentResource->settings()->setTrashCollection( m_ui->folderRequester->collection().id() );
   Akonadi::Collection trash = m_ui->folderRequester->collection();
   Akonadi::SpecialMailCollections::self()->registerCollection(Akonadi::SpecialMailCollections::Trash, trash);
   Akonadi::EntityDisplayAttribute *attribute =  trash.attribute<Akonadi::EntityDisplayAttribute>( Akonadi::Entity::AddIfMissing );
   attribute->setIconName( QLatin1String( "user-trash" ) );
   new Akonadi::CollectionModifyJob( trash );
   if (mOldTrash != trash) {
       Akonadi::SpecialMailCollections::self()->unregisterCollection(mOldTrash);
   }
 
   m_parentResource->settings()->setAutomaticExpungeEnabled( m_ui->autoExpungeCheck->isChecked() );
   m_parentResource->settings()->setUseDefaultIdentity( m_ui->useDefaultIdentityCheck->isChecked() );
 
   if ( !m_ui->useDefaultIdentityCheck->isChecked() )
     m_parentResource->settings()->setAccountIdentity( m_identityCombobox->currentIdentity() );
 
   m_parentResource->settings()->setIntervalCheckEnabled( m_ui->enableMailCheckBox->isChecked() );
   if ( m_ui->enableMailCheckBox->isChecked() )
     m_parentResource->settings()->setIntervalCheckTime( m_ui->checkInterval->value() );
 
   m_parentResource->settings()->setSieveCustomUsername(m_ui->customUsername->text());
 
   QAbstractButton *checkedButton = m_ui->customSieveGroup->checkedButton();
 
   if (checkedButton == m_ui->imapUserPassword) {
       m_parentResource->settings()->setSieveCustomAuthentification(QLatin1String("ImapUserPassword"));
   } else if (checkedButton == m_ui->noAuthentification) {
       m_parentResource->settings()->setSieveCustomAuthentification(QLatin1String("NoAuthentification"));
   } else if (checkedButton == m_ui->customUserPassword) {
       m_parentResource->settings()->setSieveCustomAuthentification(QLatin1String("CustomUserPassword"));
   }
 
   m_parentResource->settings()->setSieveCustomPassword( m_ui->customPassword->text() );
 
   m_parentResource->settings()->writeConfig();
   kDebug() << "wrote" << m_ui->imapServer->text() << m_ui->userName->text() << m_ui->safeImapGroup->checkedId();
 
   if ( m_oldResourceName != m_ui->accountName->text() && !m_ui->accountName->text().isEmpty() ) {
     m_parentResource->settings()->renameRootCollection( m_ui->accountName->text() );
   }
 }
 
 void SetupServer::readSettings()
 {
   m_folderArchiveSettingPage->loadSettings();
   m_ui->accountName->setText( m_parentResource->name() );
   m_oldResourceName = m_ui->accountName->text();
 
   KUser* currentUser = new KUser();
   KEMailSettings esetting;
 
   m_ui->imapServer->setText(
     !m_parentResource->settings()->imapServer().isEmpty() ? m_parentResource->settings()->imapServer() :
     esetting.getSetting( KEMailSettings::InServer ) );
 
   kDebug() << m_parentResource->settings()->imapPort();
   kDebug() <<  m_parentResource->settings()->safety();
   m_ui->portSpin->setValue( m_parentResource->settings()->imapPort() );
 
   m_ui->userName->setText(
     !m_parentResource->settings()->userName().isEmpty() ? m_parentResource->settings()->userName() :
     currentUser->loginName() );
 
   const QString safety = m_parentResource->settings()->safety();
   int i = KIMAP::LoginJob::TlsV1;
   if ( safety == QLatin1String( "SSL" ) ) {
     i = KIMAP::LoginJob::AnySslVersion;
   } else if ( safety == QLatin1String( "STARTTLS" ) ) {
     i = KIMAP::LoginJob::TlsV1;
   } else if ( safety == QLatin1String( "None" ) ) {
     i = KIMAP::LoginJob::Unencrypted;
   }
 
   QAbstractButton* safetyButton = m_ui->safeImapGroup->button( i );
   if ( safetyButton )
       safetyButton->setChecked( true );
 
   populateDefaultAuthenticationOptions();
   i = m_parentResource->settings()->authentication();
   kDebug() << "read IMAP auth mode: " << authenticationModeString( (MailTransport::Transport::EnumAuthenticationType::type) i );
   setCurrentAuthMode( m_ui->authenticationCombo, (MailTransport::Transport::EnumAuthenticationType::type) i );
 
   bool rejected = false;
   const QString password = m_parentResource->settings()->password( &rejected );
   if ( rejected ) {
     m_ui->password->setEnabled( false );
     KMessageBox::information( 0, i18n( "Could not access KWallet. "
                                        "If you want to store the password permanently then you have to "
                                        "activate it. If you do not "
                                        "want to use KWallet, check the box below, but note that you will be "
                                        "prompted for your password when needed." ),
                               i18n( "Do not use KWallet" ), QLatin1String("warning_kwallet_disabled") );
   } else {
     m_ui->password->insert( password );
   }
 
   m_ui->subscriptionEnabled->setChecked( m_parentResource->settings()->subscriptionEnabled() );
 
   m_ui->checkInterval->setValue( m_parentResource->settings()->intervalCheckTime() );
   m_ui->disconnectedModeEnabled->setChecked( m_parentResource->settings()->disconnectedModeEnabled() );
 
   m_ui->managesieveCheck->setChecked( m_parentResource->settings()->sieveSupport() );
   m_ui->sameConfigCheck->setChecked( m_parentResource->settings()->sieveReuseConfig() );
   m_ui->sievePortSpin->setValue( m_parentResource->settings()->sievePort() );
   m_ui->alternateURL->setText( m_parentResource->settings()->sieveAlternateUrl() );
   m_vacationFileName = m_parentResource->settings()->sieveVacationFilename();
 
 
   Akonadi::Collection trashCollection( m_parentResource->settings()->trashCollection() );
   if ( trashCollection.isValid() ) {
     Akonadi::CollectionFetchJob *fetchJob = new Akonadi::CollectionFetchJob( trashCollection,Akonadi::CollectionFetchJob::Base,this );
     connect( fetchJob, SIGNAL(collectionsReceived(Akonadi::Collection::List)),
              this, SLOT(targetCollectionReceived(Akonadi::Collection::List)) );
   } else {
     Akonadi::SpecialMailCollectionsRequestJob *requestJob = new Akonadi::SpecialMailCollectionsRequestJob( this );
     connect ( requestJob, SIGNAL(result(KJob*)),
               this, SLOT(localFolderRequestJobFinished(KJob*)) );
     requestJob->requestDefaultCollection( Akonadi::SpecialMailCollections::Trash );
     requestJob->start();
   }
 
   m_ui->useDefaultIdentityCheck->setChecked( m_parentResource->settings()->useDefaultIdentity() );
   if ( !m_ui->useDefaultIdentityCheck->isChecked() )
     m_identityCombobox->setCurrentIdentity( m_parentResource->settings()->accountIdentity() );
 
   m_ui->enableMailCheckBox->setChecked( m_parentResource->settings()->intervalCheckEnabled() );
   if ( m_ui->enableMailCheckBox->isChecked() )
     m_ui->checkInterval->setValue( m_parentResource->settings()->intervalCheckTime() );
   else
     m_ui->checkInterval->setEnabled( false );
 
   m_ui->autoExpungeCheck->setChecked( m_parentResource->settings()->automaticExpungeEnabled() );
 
   if ( m_vacationFileName.isEmpty() )
     m_vacationFileName = QLatin1String("kmail-vacation.siv");
 
   m_ui->customUsername->setText(m_parentResource->settings()->sieveCustomUsername());
 
   m_ui->customPassword->setText(m_parentResource->settings()->sieveCustomPassword());
 
 
   const QString sieverCustomAuth(m_parentResource->settings()->sieveCustomAuthentification());
   if (sieverCustomAuth == QLatin1String("ImapUserPassword"))
       m_ui->imapUserPassword->setChecked(true);
   else if (sieverCustomAuth == QLatin1String("NoAuthentification"))
       m_ui->noAuthentification->setChecked(true);
   else if (sieverCustomAuth == QLatin1String("CustomUserPassword"))
       m_ui->customUserPassword->setChecked(true);
 
   delete currentUser;
 }
 
 void SetupServer::slotTest()
 {
   kDebug() << m_ui->imapServer->text();
 
   m_ui->testButton->setEnabled( false );
   m_ui->safeImap->setEnabled( false );
   m_ui->authenticationCombo->setEnabled( false );
 
   m_ui->testInfo->clear();
   m_ui->testInfo->hide();
 
   delete m_serverTest;
   m_serverTest = new MailTransport::ServerTest( this );
 #ifndef QT_NO_CURSOR
   qApp->setOverrideCursor( Qt::BusyCursor );
 #endif
 
   const QString server = m_ui->imapServer->text();
   const int port = m_ui->portSpin->value();
   kDebug() << "server: " << server << "port: " << port;
 
   m_serverTest->setServer( server );
 
   if ( port != 143 && port != 993 ) {
     m_serverTest->setPort( MailTransport::Transport::EnumEncryption::None, port );
     m_serverTest->setPort( MailTransport::Transport::EnumEncryption::SSL, port );
   }
 
   m_serverTest->setProtocol( QLatin1String("imap") );
   m_serverTest->setProgressBar( m_ui->testProgress );
   connect( m_serverTest, SIGNAL(finished(QList<int>)),
            SLOT(slotFinished(QList<int>)) );
   enableButtonOk( false );
   m_serverTest->start();
 }
 
 void SetupServer::slotFinished( const QList<int> &testResult )
 {
   kDebug() << testResult;
 
 #ifndef QT_NO_CURSOR
   qApp->restoreOverrideCursor();
 #endif
   enableButtonOk( true );
 
   using namespace MailTransport;
 
   if ( !m_serverTest->isNormalPossible() && !m_serverTest->isSecurePossible() )
     KMessageBox::sorry( this, i18n( "Unable to connect to the server, please verify the server address." ) );
 
   m_ui->testInfo->show();
 
   m_ui->sslRadio->setEnabled( testResult.contains( Transport::EnumEncryption::SSL ) );
   m_ui->tlsRadio->setEnabled( testResult.contains( Transport::EnumEncryption::TLS ) );
   m_ui->noRadio->setEnabled( testResult.contains( Transport::EnumEncryption::None ) );
 
   QString text;
   if ( testResult.contains( Transport::EnumEncryption::TLS ) ) {
     m_ui->tlsRadio->setChecked( true );
     text = i18n( "<qt><b>TLS is supported and recommended.</b></qt>" );
   } else if ( testResult.contains( Transport::EnumEncryption::SSL ) ) {
     m_ui->sslRadio->setChecked( true );
     text = i18n( "<qt><b>SSL is supported and recommended.</b></qt>" );
   } else if ( testResult.contains( Transport::EnumEncryption::None ) ) {
     m_ui->noRadio->setChecked( true );
     text = i18n( "<qt><b>No security is supported. It is not "
                  "recommended to connect to this server.</b></qt>" );
   } else {
     text = i18n( "<qt><b>It is not possible to use this server.</b></qt>" );
   }
   m_ui->testInfo->setText( text );
 
   m_ui->testButton->setEnabled( true );
   m_ui->safeImap->setEnabled( true );
   m_ui->authenticationCombo->setEnabled( true );
   slotEncryptionRadioChanged();
   slotSafetyChanged();
 }
 
 void SetupServer::slotTestChanged()
 {
   delete m_serverTest;
   m_serverTest = 0;
   slotSafetyChanged();
 
   // do not use imapConnectionPossible, as the data is not yet saved.
   m_ui->testButton->setEnabled( true /* TODO Global::connectionPossible() ||
                                         m_ui->imapServer->text() == "localhost"*/ );
 }
 
 void SetupServer::slotEnableWidgets()
 {
   const bool haveSieve = m_ui->managesieveCheck->isChecked();
   const bool reuseConfig = m_ui->sameConfigCheck->isChecked();
 
   m_ui->sameConfigCheck->setEnabled( haveSieve );
   m_ui->sievePortSpin->setEnabled( haveSieve && reuseConfig );
   m_ui->alternateURL->setEnabled( haveSieve && !reuseConfig );
   m_ui->authentification->setEnabled( haveSieve && !reuseConfig );
 }
 
 void SetupServer::slotComplete()
 {
   const bool ok =  !m_ui->imapServer->text().isEmpty() && !m_ui->userName->text().isEmpty();
   button( KDialog::Ok )->setEnabled( ok );
 }
 
 void SetupServer::slotSafetyChanged()
 {
   if ( m_serverTest == 0 ) {
     kDebug() << "serverTest null";
     m_ui->noRadio->setEnabled( true );
     m_ui->sslRadio->setEnabled( true );
     m_ui->tlsRadio->setEnabled( true );
 
     m_ui->authenticationCombo->setEnabled( true );
     return;
   }
 
   QList<int> protocols;
 
   switch ( m_ui->safeImapGroup->checkedId() ) {
   case KIMAP::LoginJob::Unencrypted :
     kDebug() << "safeImapGroup: unencrypted";
     protocols = m_serverTest->normalProtocols();
     break;
   case KIMAP::LoginJob::AnySslVersion:
     protocols = m_serverTest->secureProtocols();
     kDebug() << "safeImapGroup: SSL";
     break;
   case KIMAP::LoginJob::TlsV1:
     protocols = m_serverTest->tlsProtocols();
     kDebug() << "safeImapGroup: starttls";
     break;
   default:
     kFatal() << "Shouldn't happen";
   }
 
   m_ui->authenticationCombo->clear();
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::CLEAR );
   foreach ( int prot, protocols ) {
     addAuthenticationItem( m_ui->authenticationCombo, (MailTransport::Transport::EnumAuthenticationType::type) prot );
   }
   if ( protocols.size() > 0 )
     setCurrentAuthMode( m_ui->authenticationCombo, (MailTransport::Transport::EnumAuthenticationType::type) protocols.first() );
   else
     kDebug() << "no authmodes found";
 }
 
 void SetupServer::slotManageSubscriptions()
 {
   kDebug() << "manage subscripts";
   ImapAccount account;
 
   account.setServer( m_ui->imapServer->text() );
   account.setPort( m_ui->portSpin->value() );
 
   account.setUserName( m_ui->userName->text() );
   account.setSubscriptionEnabled( m_ui->subscriptionEnabled->isChecked() );
 
   account.setEncryptionMode(
     static_cast<KIMAP::LoginJob::EncryptionMode>( m_ui->safeImapGroup->checkedId() )
   );
 
   account.setAuthenticationMode( Settings::mapTransportAuthToKimap( getCurrentAuthMode( m_ui->authenticationCombo ) ) );
 
   QPointer<SubscriptionDialog> subscriptions = new SubscriptionDialog( this );
   subscriptions->setCaption(  i18n( "Serverside Subscription" ) );
   subscriptions->setWindowIcon( KIcon( QLatin1String("network-server") ) );
   subscriptions->connectAccount( account, m_ui->password->text() );
   m_subscriptionsChanged = subscriptions->isSubscriptionChanged();
 
   subscriptions->exec();
   delete subscriptions;
 
   m_ui->subscriptionEnabled->setChecked( account.isSubscriptionEnabled() );
 }
 
 void SetupServer::slotShowServerInfo()
 {
   ServerInfoDialog *dialog = new ServerInfoDialog(m_parentResource, this);
   dialog->show();
 }
 
 void SetupServer::targetCollectionReceived( const Akonadi::Collection::List &collections )
 {
   m_ui->folderRequester->setCollection( collections.first() );
   mOldTrash = collections.first();
 }
 
 void SetupServer::localFolderRequestJobFinished( KJob *job )
 {
   if ( !job->error() ) {
     Akonadi::Collection targetCollection = Akonadi::SpecialMailCollections::self()->defaultCollection( Akonadi::SpecialMailCollections::Trash );
     Q_ASSERT( targetCollection.isValid() );
      m_ui->folderRequester->setCollection( targetCollection );
      mOldTrash = targetCollection;
   }
 }
 
 void SetupServer::populateDefaultAuthenticationOptions()
 {
   m_ui->authenticationCombo->clear();
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::CLEAR);
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::LOGIN );
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::PLAIN );
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::CRAM_MD5 );
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::DIGEST_MD5 );
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::NTLM );
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::GSSAPI );
   addAuthenticationItem( m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::ANONYMOUS );
 }
 
 
 
 
diff --git a/resources/kolab/setupserver.h b/resources/kolab/setupserver.h
index c5650f35a..19384744a 100644
--- a/resources/kolab/setupserver.h
+++ b/resources/kolab/setupserver.h
@@ -1,113 +1,114 @@
 /* This file is part of the KDE project
    Copyright (C) 2010 Casey Link <unnamedrambler@gmail.com>
    Copyright (c) 2009-2010 Klaralvdalens Datakonsult AB, a KDAB Group company <info@kdab.net>
    Copyright (C) 2009 Kevin Ottens <ervin@kde.org>
    Copyright (C) 2006-2008 Omat Holding B.V. <info@omat.nl>
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #ifndef SETUPSERVER_H
 #define SETUPSERVER_H
 
 #include <klineedit.h>
 #include <kdialog.h>
 #include <akonadi/collection.h>
 #include <KJob>
 
 #include <QRegExpValidator>
 
 namespace Ui
 {
 class SetupServerView;
 }
 
 namespace MailTransport
 {
 class ServerTest;
 }
 namespace KPIMIdentities
 {
 class IdentityCombo;
 class IdentityManager;
 }
 class FolderArchiveSettingPage;
 class ImapResourceBase;
 
 /**
  * @class SetupServer
  * These contain the account settings
  * @author Tom Albers <tomalbers@kde.nl>
  */
 class SetupServer : public KDialog
 {
   Q_OBJECT
 
 public:
   /**
    * Constructor
    * @param parentResource The resource this dialog belongs to
    * @param parent Parent WId
    */
   SetupServer( ImapResourceBase *parentResource, WId parent );
 
   /**
    * Destructor
    */
   ~SetupServer();
 
   bool shouldClearCache() const;
 
 private slots:
   /**
    * Call this if you want the settings saved from this page.
    */
   void applySettings();
   void slotIdentityCheckboxChanged();
   void slotMailCheckboxChanged();
   void slotEncryptionRadioChanged();
   void slotSubcriptionCheckboxChanged();
   void slotShowServerInfo();
 private:
   void readSettings();
   void populateDefaultAuthenticationOptions();
 
   ImapResourceBase *m_parentResource;
   Ui::SetupServerView *m_ui;
   MailTransport::ServerTest *m_serverTest;
   bool m_subscriptionsChanged;
   bool m_shouldClearCache;
   QString m_vacationFileName;
   KPIMIdentities::IdentityManager *m_identityManager;
   KPIMIdentities::IdentityCombo *m_identityCombobox;
   QString m_oldResourceName;
   QRegExpValidator mValidator;
+  QRegExpValidator mSieveUrlValidator;
   Akonadi::Collection mOldTrash;
   FolderArchiveSettingPage *m_folderArchiveSettingPage;
 
 private slots:
   void slotTest();
   void slotFinished(const QList<int> &testResult );
   void slotCustomSieveChanged();
 
   void slotTestChanged();
   void slotComplete();
   void slotSafetyChanged();
   void slotManageSubscriptions();
   void slotEnableWidgets();
   void targetCollectionReceived(const Akonadi::Collection::List &collections );
   void localFolderRequestJobFinished( KJob *job );
 };
 
 #endif
diff --git a/resources/kolab/setupserverview_desktop.ui b/resources/kolab/setupserverview_desktop.ui
index 3c1e3bd25..9dc682242 100644
--- a/resources/kolab/setupserverview_desktop.ui
+++ b/resources/kolab/setupserverview_desktop.ui
@@ -1,672 +1,675 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SetupServerView</class>
  <widget class="QWidget" name="SetupServerView">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>481</width>
     <height>528</height>
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
        <string>General</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
           <string>Account Information</string>
          </property>
          <layout class="QFormLayout" name="formLayout_2">
           <item row="0" column="0">
            <widget class="QLabel" name="label_8">
             <property name="text">
              <string>Account Name:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="KLineEdit" name="accountName">
             <property name="trapReturnKey" stdset="0">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label">
             <property name="whatsThis">
              <string>Indicate the IMAP server. If you want to connect to a non-standard port for a specific encryption scheme, you can add &quot;:port&quot; to indicate that. For example: &quot;imap.foo.com:144&quot;.</string>
             </property>
             <property name="text">
              <string>IMAP Server:</string>
             </property>
             <property name="buddy">
              <cstring>imapServer</cstring>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="KLineEdit" name="imapServer">
             <property name="trapReturnKey" stdset="0">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_2">
             <property name="whatsThis">
              <string>The username.</string>
             </property>
             <property name="text">
              <string>Username:</string>
             </property>
             <property name="buddy">
              <cstring>userName</cstring>
             </property>
            </widget>
           </item>
           <item row="2" column="1">
            <widget class="KLineEdit" name="userName">
             <property name="trapReturnKey" stdset="0">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="3" column="0">
            <widget class="QLabel" name="label_3">
             <property name="whatsThis">
              <string>The password.</string>
             </property>
             <property name="text">
              <string>Password:</string>
             </property>
             <property name="buddy">
              <cstring>password</cstring>
             </property>
            </widget>
           </item>
           <item row="3" column="1">
            <widget class="KLineEdit" name="password">
             <property name="echoMode">
              <enum>QLineEdit::Password</enum>
             </property>
             <property name="trapReturnKey" stdset="0">
              <bool>true</bool>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="checkOptions">
          <property name="title">
           <string>Mail Checking Options</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_6">
           <item>
            <widget class="QCheckBox" name="disconnectedModeEnabled">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="text">
              <string>&amp;Download all messages for offline use</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="enableMailCheckBox">
             <property name="text">
              <string>Enable &amp;interval mail checking</string>
             </property>
            </widget>
           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_1">
             <item>
              <widget class="QLabel" name="label_7">
               <property name="text">
                <string>Check mail interval:</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="KIntNumInput" name="checkInterval" native="true">
               <property name="value" stdset="0">
                <number>1</number>
               </property>
               <property name="minimum" stdset="0">
                <number>0</number>
               </property>
               <property name="suffix" stdset="0">
                <string/>
               </property>
               <property name="prefix" stdset="0">
                <string/>
               </property>
              </widget>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
        <string>Filtering</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <widget class="QCheckBox" name="managesieveCheck">
          <property name="text">
           <string>Server supports Sieve</string>
          </property>
          <property name="checked">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="sameConfigCheck">
          <property name="text">
           <string>Reuse host and login configuration</string>
          </property>
          <property name="checked">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QLabel" name="label_14">
          <property name="text">
           <string>The server port changed when ManageSieve turned into a full RFC Standard. Old server implementations still use port 2000, while newer standard conform server can only be accessed via port 4190.</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
           <widget class="QLabel" name="label_5">
            <property name="text">
             <string>Managesieve port:</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="KIntSpinBox" name="sievePortSpin">
            <property name="maximum">
             <number>65535</number>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <item>
           <widget class="QLabel" name="label_6">
            <property name="text">
             <string>Alternate URL:</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="KLineEdit" name="alternateURL">
+           <property name="placeholderText">
+            <string>sieve://server:port</string>
+           </property>
            <property name="trapReturnKey" stdset="0">
             <bool>true</bool>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <widget class="QGroupBox" name="authentification">
          <property name="title">
           <string>Authentication</string>
          </property>
          <layout class="QGridLayout" name="gridLayout">
           <item row="5" column="1">
            <widget class="KLineEdit" name="customPassword">
             <property name="echoMode">
              <enum>QLineEdit::Password</enum>
             </property>
             <property name="trapReturnKey" stdset="0">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="1" column="0" colspan="2">
            <widget class="QRadioButton" name="noAuthentification">
             <property name="text">
              <string>No authentication</string>
             </property>
             <attribute name="buttonGroup">
              <string notr="true">customSieveGroup</string>
             </attribute>
            </widget>
           </item>
           <item row="5" column="0">
            <widget class="QLabel" name="label_13">
             <property name="text">
              <string>Password:</string>
             </property>
            </widget>
           </item>
           <item row="4" column="0">
            <widget class="QLabel" name="label_12">
             <property name="text">
              <string>Username:</string>
             </property>
            </widget>
           </item>
           <item row="3" column="0" colspan="2">
            <widget class="QRadioButton" name="customUserPassword">
             <property name="text">
              <string>Username and Password</string>
             </property>
             <attribute name="buttonGroup">
              <string notr="true">customSieveGroup</string>
             </attribute>
            </widget>
           </item>
           <item row="4" column="1">
            <widget class="KLineEdit" name="customUsername">
             <property name="trapReturnKey" stdset="0">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QRadioButton" name="imapUserPassword">
             <property name="text">
              <string>IMAP Username and Password</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
             <attribute name="buttonGroup">
              <string notr="true">customSieveGroup</string>
             </attribute>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_4">
       <attribute name="title">
        <string>Advanced</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
           <string>IMAP Settings</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_5">
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_8">
             <item>
              <widget class="QCheckBox" name="subscriptionEnabled">
               <property name="text">
                <string>Enable server-side subscriptions</string>
               </property>
               <property name="checked">
                <bool>true</bool>
               </property>
              </widget>
             </item>
             <item>
              <widget class="KPushButton" name="subscriptionButton">
               <property name="enabled">
                <bool>true</bool>
               </property>
               <property name="text">
                <string>Serverside Subscription...</string>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item>
            <widget class="QCheckBox" name="autoExpungeCheck">
             <property name="text">
              <string>Automaticall&amp;y compact folders (expunges deleted messages)</string>
             </property>
            </widget>
           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_7">
             <item>
              <widget class="QLabel" name="label_11">
               <property name="text">
                <string>Trash folder:</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="Akonadi::CollectionRequester" name="folderRequester"/>
             </item>
            </layout>
           </item>
           <item>
            <widget class="QGroupBox" name="identityBox">
             <property name="title">
              <string>Identity Settings</string>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_7">
              <item>
               <widget class="QCheckBox" name="useDefaultIdentityCheck">
                <property name="toolTip">
                 <string>Use the default identity for this account</string>
                </property>
                <property name="text">
                 <string>Use &amp;default identity</string>
                </property>
               </widget>
              </item>
              <item>
               <layout class="QHBoxLayout" name="identityLayout">
                <item>
                 <widget class="QLabel" name="identityLabel">
                  <property name="toolTip">
                   <string>Select the KMail identity used for this account</string>
                  </property>
                  <property name="text">
                   <string>Identity:</string>
                  </property>
                 </widget>
                </item>
               </layout>
              </item>
             </layout>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="safeImap">
          <property name="whatsThis">
           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'HandelGotDLig'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-weight:600;&quot;&gt;SSL/TLS&lt;/span&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt; is safe IMAP over port 993;&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-weight:600;&quot;&gt;STARTTLS&lt;/span&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt; will operate on port 143 and switch to a secure connection directly after connecting;&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-weight:600;&quot;&gt;None&lt;/span&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt; will connect to port 143 but not switch to a secure connection. This setting is not recommended.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="title">
           <string>Connection Settings</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
            <widget class="KPushButton" name="testButton">
             <property name="text">
              <string>Auto Detect</string>
             </property>
            </widget>
           </item>
           <item>
            <layout class="QFormLayout" name="formLayout">
             <property name="fieldGrowthPolicy">
              <enum>QFormLayout::ExpandingFieldsGrow</enum>
             </property>
             <item row="1" column="0">
              <widget class="QLabel" name="label_9">
               <property name="text">
                <string>Encryption:</string>
               </property>
              </widget>
             </item>
             <item row="1" column="1">
              <layout class="QHBoxLayout" name="horizontalLayout">
               <item>
                <widget class="QRadioButton" name="noRadio">
                 <property name="text">
                  <string>None</string>
                 </property>
                 <property name="checked">
                  <bool>false</bool>
                 </property>
                 <attribute name="buttonGroup">
                  <string notr="true">safeImapGroup</string>
                 </attribute>
                </widget>
               </item>
               <item>
                <widget class="QRadioButton" name="sslRadio">
                 <property name="text">
                  <string>SSL/TLS</string>
                 </property>
                 <attribute name="buttonGroup">
                  <string notr="true">safeImapGroup</string>
                 </attribute>
                </widget>
               </item>
               <item>
                <widget class="QRadioButton" name="tlsRadio">
                 <property name="text">
                  <string>STARTTLS</string>
                 </property>
                 <property name="checked">
                  <bool>true</bool>
                 </property>
                 <attribute name="buttonGroup">
                  <string notr="true">safeImapGroup</string>
                 </attribute>
                </widget>
               </item>
              </layout>
             </item>
             <item row="2" column="0">
              <widget class="QLabel" name="label_4">
               <property name="text">
                <string>Port:</string>
               </property>
              </widget>
             </item>
             <item row="2" column="1">
              <widget class="QSpinBox" name="portSpin">
               <property name="minimum">
                <number>1</number>
               </property>
               <property name="maximum">
                <number>65534</number>
               </property>
               <property name="value">
                <number>143</number>
               </property>
              </widget>
             </item>
             <item row="3" column="0">
              <widget class="QLabel" name="label_10">
               <property name="text">
                <string>Authentication:</string>
               </property>
              </widget>
             </item>
             <item row="3" column="1">
              <widget class="QComboBox" name="authenticationCombo">
               <item>
                <property name="text">
                 <string>Clear text</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>LOGIN</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>PLAIN</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>CRAM-MD5</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>DIGEST-MD5</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>NTLM</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>GSSAPI</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Anonymous</string>
                </property>
               </item>
              </widget>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QLabel" name="testInfo">
          <property name="font">
           <font>
            <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
          <property name="text">
           <string>Empty</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QProgressBar" name="testProgress">
          <property name="value">
           <number>24</number>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="showServerInfo">
          <property name="text">
           <string>Server Info</string>
          </property>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KPushButton</class>
    <extends>QPushButton</extends>
    <header>kpushbutton.h</header>
   </customwidget>
   <customwidget>
    <class>KIntSpinBox</class>
    <extends>QSpinBox</extends>
    <header>knuminput.h</header>
   </customwidget>
   <customwidget>
    <class>KIntNumInput</class>
    <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
   <customwidget>
    <class>Akonadi::CollectionRequester</class>
    <extends>QFrame</extends>
    <header>Akonadi/CollectionRequester</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
  <buttongroups>
   <buttongroup name="safeImapGroup"/>
   <buttongroup name="customSieveGroup"/>
  </buttongroups>
 </ui>