diff --git a/create-mailbox.php b/create-mailbox.php
index 089b93dc..cc22cca4 100644
--- a/create-mailbox.php
+++ b/create-mailbox.php
@@ -278,13 +278,6 @@ TODO: this is the end of /create-mailbox.php code segment
  */
       $tDomain = $fDomain;
 
-      if (create_mailbox_subfolders($fUsername,$fPassword))
-      {
-         $tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername";
-      } else {
-         $tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername";
-      }
-
       if ($CONF['generate_password'] == "YES")
       {
          $tMessage .= " / $fPassword)</br />";
@@ -326,6 +319,14 @@ TODO: this is the end of /create-mailbox.php code segment
             $tMessage .= "<br />" . $PALANG['pSendmail_result_success'] . "<br />";
          }
       }
+
+      if (create_mailbox_subfolders($fUsername,$fPassword))
+      {
+         $tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername";
+      } else {
+         $tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername";
+      }
+
       }
    }
 }
diff --git a/functions.inc.php b/functions.inc.php
index 40173eae..d1fe69f2 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -1886,6 +1886,8 @@ function create_mailbox_subfolders($login,$cleartext_password)
 
    $s='{'.$s_host.$s_port.$s_options.'}';
 
+   sleep(1); # give the mail triggering the mailbox creation a chance to do its job
+
    $i=@imap_open($s,$login,$cleartext_password);
    if (FALSE==$i)
    {
diff --git a/setup.php b/setup.php
index b07a757c..fa499d66 100644
--- a/setup.php
+++ b/setup.php
@@ -80,7 +80,9 @@ if ($f_apache_get_version == 1)
 }
 else
 {
-   print "<li><b>Unable to check for Apache version. (missing function: apache_get_version())<br />(Ignore this warning if you use another webserver software.)</b></li>\n";
+   # not running on Apache.
+   # However postfixadmin _is_ running, so obviously we are on a supported webserver ;-))
+   # No need to confuse the user with a warning.
 }
 
 print "</ul>";