diff --git a/setup/owncloud.sh b/setup/owncloud.sh
index e3c125c9..59f3fbbf 100644
--- a/setup/owncloud.sh
+++ b/setup/owncloud.sh
@@ -14,7 +14,7 @@ apt-get purge -qq -y owncloud*
 # Install ownCloud from source if it is not already present
 # TODO: Check version?
 if [ ! -d /usr/local/lib/owncloud ]; then
-	echo Installing ownCloud...
+	echo installing ownCloud...
 	rm -f /tmp/owncloud.zip
 	wget -qO /tmp/owncloud.zip https://download.owncloud.org/community/owncloud-7.0.1.zip
 	unzip /tmp/owncloud.zip -d /usr/local/lib
diff --git a/setup/zpush.sh b/setup/zpush.sh
index 7d793311..e18c0b20 100755
--- a/setup/zpush.sh
+++ b/setup/zpush.sh
@@ -21,7 +21,7 @@ php5enmod imap
 # Copy Z-Push into place.
 if [ ! -d /usr/local/lib/z-push ]; then
 	rm -f /tmp/zpush.zip
-	echo Installing z-push...
+	echo installing z-push...
 	wget -qO /tmp/zpush.zip https://github.com/fmbiete/Z-Push-contrib/archive/master.zip
 	unzip /tmp/zpush.zip -d /usr/local/lib/
 	mv /usr/local/lib/Z-Push-contrib-master /usr/local/lib/z-push
diff --git a/tools/update_mail_app.sh b/tools/update_mail_app.sh
new file mode 100644
index 00000000..61cff821
--- /dev/null
+++ b/tools/update_mail_app.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Simple script to update the mail app in ownCloud, not needed once it reaches beta+
+
+echo installing mail app...
+rm -f /tmp/owncloud_mail.zip
+wget -qO /tmp/owncloud_mail.zip https://github.com/owncloud/mail/archive/master.zip
+unzip /tmp/owncloud_mail.zip -d /usr/local/lib/owncloud/apps
+mv /usr/local/lib/owncloud/apps/mail-master /usr/local/lib/owncloud/apps/mail
+rm -f /tmp/owncloud.zip
+
+echo installing php composer and mail app dependencies...
+curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/lib/owncloud/apps/mail
+php /usr/local/lib/owncloud/apps/mail/composer.phar install --working-dir=/usr/local/lib/owncloud/apps/mail
+chmod -R 777 /usr/local/lib/owncloud/apps/mail/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer
+
+echo DONE! :-)
\ No newline at end of file