diff --git a/libksieve/ksieveui/vacation/tests/main.cpp b/libksieve/ksieveui/vacation/tests/main.cpp
--- a/libksieve/ksieveui/vacation/tests/main.cpp
+++ b/libksieve/ksieveui/vacation/tests/main.cpp
@@ -29,7 +29,7 @@
     KCmdLineArgs::init(argc, argv, "vacationmultiscripttest", 0, ki18n("VacationMultiScriptTest_Gui"),
                        "1.0", ki18n("Test for dialog when server has multiscript"));
     KApplication app;
-    app.setQuitOnLastWindowClosed( false );
+    app.setQuitOnLastWindowClosed( true );
 
     KSieveUi::MultiImapVacationManager manager;
     KSieveUi::MultiImapVacationDialog dlg(&manager);
diff --git a/libksieve/ksieveui/vacation/tests/vacationutilstest.cpp b/libksieve/ksieveui/vacation/tests/vacationutilstest.cpp
--- a/libksieve/ksieveui/vacation/tests/vacationutilstest.cpp
+++ b/libksieve/ksieveui/vacation/tests/vacationutilstest.cpp
@@ -47,15 +47,15 @@
 void VacationUtilsTest::testParseEmptyScript()
 {
     const QString script;
-    QCOMPARE(VacationUtils::foundVacationScript(script), false);
+    QCOMPARE(VacationUtils::parseScript(script).isValid(), false);
 }
 
 void VacationUtilsTest::testParseOnlyComment()
 {
     QString script(QLatin1String("#comment"));
-    QCOMPARE(VacationUtils::foundVacationScript(script), false);
+    QCOMPARE(VacationUtils::parseScript(script).isValid(), false);
     script = QLatin1String("#comment\n\n#comment\n");
-    QCOMPARE(VacationUtils::foundVacationScript(script), false);
+    QCOMPARE(VacationUtils::parseScript(script).isValid(), false);
 }
 
 void VacationUtilsTest::testParseActivate_data()
@@ -82,7 +82,6 @@
     QFile file(QLatin1String(VACATIONTESTDATADIR)+filename);
     QVERIFY(file.open(QIODevice::ReadOnly));
     QString script = QString::fromUtf8(file.readAll());
-    QCOMPARE(VacationUtils::foundVacationScript(script), found);
 
     VacationUtils::Vacation vacation = VacationUtils::parseScript(script);
     QCOMPARE(vacation.isValid(), found);
diff --git a/libksieve/ksieveui/vacation/vacationcheckjob.h b/libksieve/ksieveui/vacation/vacationcheckjob.h
--- a/libksieve/ksieveui/vacation/vacationcheckjob.h
+++ b/libksieve/ksieveui/vacation/vacationcheckjob.h
@@ -52,7 +52,6 @@
     void emitError(const QString &errorMessage);
     void searchVacationScript();
     void getNextScript();
-    bool isVacationScipt(const QString &script) const;
     bool isLastScript() const;
 
 private:
diff --git a/libksieve/ksieveui/vacation/vacationcheckjob.cpp b/libksieve/ksieveui/vacation/vacationcheckjob.cpp
--- a/libksieve/ksieveui/vacation/vacationcheckjob.cpp
+++ b/libksieve/ksieveui/vacation/vacationcheckjob.cpp
@@ -85,9 +85,10 @@
     mSieveJob = 0;
 
     if (mKep14Support) {
-        if (isVacationScipt(script)) {
+        VacationUtils::Vacation vacation = VacationUtils::parseScript(script);
+        if (vacation.isValid()) {
             const QString &scriptName = mAvailableScripts[mScriptPos-1];
-            emit scriptActive(this, scriptName, mActiveScripts.contains(scriptName) && VacationUtils::vacationScriptActive(script));
+            emit scriptActive(this, scriptName, mActiveScripts.contains(scriptName) && vacation.active);
             kDebug() << "vacation script found :)";
         } else if (isLastScript()) {
             mNoScriptFound = true;
@@ -184,11 +185,6 @@
     return mScriptPos >= mAvailableScripts.count();
 }
 
-bool VacationCheckJob::isVacationScipt(const QString &script) const
-{
-    return KSieveUi::VacationUtils::foundVacationScript(script);
-}
-
 bool VacationCheckJob::noScriptFound()
 {
     return mNoScriptFound;
diff --git a/libksieve/ksieveui/vacation/vacationpagewidget.cpp b/libksieve/ksieveui/vacation/vacationpagewidget.cpp
--- a/libksieve/ksieveui/vacation/vacationpagewidget.cpp
+++ b/libksieve/ksieveui/vacation/vacationpagewidget.cpp
@@ -125,7 +125,7 @@
 
      KSieveUi::VacationUtils::Vacation vacation = KSieveUi::VacationUtils::parseScript(script);
 
-    if (!vacation.isValid() && !script.timmed().isEmpty() ) {
+    if (!vacation.isValid() && !script.trimmed().isEmpty() ) {
         mVacationWarningWidget->setVisible(true);
     }
 
diff --git a/libksieve/ksieveui/vacation/vacationutils.h b/libksieve/ksieveui/vacation/vacationutils.h
--- a/libksieve/ksieveui/vacation/vacationutils.h
+++ b/libksieve/ksieveui/vacation/vacationutils.h
@@ -53,12 +53,6 @@
 
 KSieveUi::VacationUtils::Vacation parseScript(const QString &script);
 
-//returns if a vacation script is found in the sieve script
-bool foundVacationScript(const QString &script);
-
-// returns if the vacation script is active
-bool vacationScriptActive(const QString &script);
-
 QString mergeRequireLine(const QString &script1, const QString script2);
 
 QString updateVacationBlock(const QString &oldScript, const QString &newScript);
diff --git a/libksieve/ksieveui/vacation/vacationutils.cpp b/libksieve/ksieveui/vacation/vacationutils.cpp
--- a/libksieve/ksieveui/vacation/vacationutils.cpp
+++ b/libksieve/ksieveui/vacation/vacationutils.cpp
@@ -172,17 +172,6 @@
     return vacation;
 }
 
-bool KSieveUi::VacationUtils::foundVacationScript(const QString &script)
-{
-    return parseScript(script).isValid();
-}
-
-bool KSieveUi::VacationUtils::vacationScriptActive(const QString &script)
-{
-    const KSieveUi::VacationUtils::Vacation vacation = parseScript(script);
-    return vacation.isValid() && vacation.active;
-}
-
 QString composeOldScript( const QString & messageText,
                                  const QString &subject,
                                  int notificationInterval,