diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index bd9fb6da13..79d9eca5c2 100644
--- a/data/system/boot/Bootscript
+++ b/data/system/boot/Bootscript
@@ -16,7 +16,19 @@ launch() {
 		echo There is no "$1"
 	fi
 	return 0
-}
+}	
+
+launch_param_1() {
+	if [ -f "/boot/$1" ]
+	then
+		"/boot/$1" $2 &
+		[ "$3" != "" ] && waitfor "$3"
+		return 1
+	else
+		echo There is no "$1"
+	fi
+	return 0
+}	
 
 # launchscript <script path>
 
@@ -78,7 +90,7 @@ launch $SERVERS/debug_server				# launch debug_server
 
 # Init Network
 if [ "$SAFEMODE" != "yes" ]; then
-	launch $SERVERS/net_server				# launch net_server
+	launch $SERVERS/net_server			# launch net_server
 fi
 
 if [ "$SAFEMODE" != "yes" ]; then
@@ -119,6 +131,11 @@ if [ "$SAFEMODE" != "yes" ]; then
 	launch $SERVERS/print_server
 fi
 
+# Launch Mail Daemon (if enabled on startup)
+if [ "$SAFEMODE" != "yes" ]; then
+	launch_param_1 $SERVERS/mail_daemon -E
+fi
+
 # Check for daily saving time
 launch beos/bin/dstcheck