diff --git a/sievejob.cpp b/sievejob.cpp
index 24c9327c5..e0e8c59b7 100644
--- a/sievejob.cpp
+++ b/sievejob.cpp
@@ -81,7 +81,9 @@ namespace KMail {
       kdDebug(5006) << "SieveJob::schedule: listDir( " << mUrl.prettyURL() << " )" << endl;
       {
 	KURL url = mUrl;
+	QString query = url.query(); //save query part, because KURL::cd() erases it
 	url.cd("..");
+	url.setQuery( query );
 	kdDebug(5006) << "SieveJob::schedule: listDir's real URL: " << url.prettyURL()
 		  << endl;
 	mJob = KIO::listDir( url );
diff --git a/vacation.cpp b/vacation.cpp
index 4434d4c06..6ce091f58 100644
--- a/vacation.cpp
+++ b/vacation.cpp
@@ -228,6 +228,7 @@ namespace KMail {
       u.setUser( a->login() );
       u.setPass( a->passwd() );
       u.setPort( sieve.port() );
+      u.setQuery( "x-mech=" + (a->auth() == "*" ? "PLAIN" : a->auth()) ); //translate IMAP LOGIN to PLAIN
       return u;
     } else {
       return sieve.alternateURL();