diff --git a/run-community-server.sh b/run-community-server.sh
index b838a38..196d23f 100644
--- a/run-community-server.sh
+++ b/run-community-server.sh
@@ -464,6 +464,12 @@ fi
 
 if [ "${MAIL_SERVER_ENABLED}" == "true" ]; then
 
+    if [ "${DOCKER_ENABLED}" == "true" ]; then
+	while ! bash ${SYSCONF_TOOLS_DIR}/wait-for-it.sh  ${MAIL_SERVER_DB_HOST}:25 --quiet -s -- log_debug "MailServer is up"; do
+		sleep 1
+	done
+    fi
+
     timeout=120;
     interval=10;