diff --git a/docker/rootfs/start.sh b/docker/rootfs/start.sh
index d2850c7..23dc23e 100644
--- a/docker/rootfs/start.sh
+++ b/docker/rootfs/start.sh
@@ -25,17 +25,27 @@ echo ' [+] Setting up config.ini'
echo "[GENERAL]" > /var/www/opentrashmail/config.ini
if [ "$DOMAINS" != "" ]; then
echo "DOMAINS=$DOMAINS" >> /var/www/opentrashmail/config.ini
- echo " [i] Active Domain(s): $DOMAINS"
+ echo " [i] Active Domain(s): $DOMAINS"
fi
if [ "$ADMIN" != "" ]; then
echo "ADMIN=$ADMIN" >> /var/www/opentrashmail/config.ini
- echo " [i] Set admin to: $ADMIN"
+ echo " [i] Set admin to: $ADMIN"
fi
echo "[MAILSERVER]" >> /var/www/opentrashmail/config.ini
echo "MAILPORT=25" >> /var/www/opentrashmail/config.ini
+echo "[DATETIME]" >> /var/www/opentrashmail/config.ini
+if [ "$DATEFORMAT" != "" ]; then
+ echo "DATEFORMAT=$DATEFORMAT" >> /var/www/opentrashmail/config.ini
+ echo " [i] Setting up dateformat to: $DATEFORMAT"
+else
+ echo "DATEFORMAT='D.M.YYYY HH:mm'" >> /var/www/opentrashmail/config.ini
+ echo " [i] Using default dateformat"
+fi
+
+
cd /var/www/opentrashmail/python
echo ' [+] Starting Mailserver'
diff --git a/example.config.ini b/example.config.ini
index 24f67ba..ca74072 100644
--- a/example.config.ini
+++ b/example.config.ini
@@ -10,4 +10,7 @@ DOMAINS=yourdomain,sub.yourdomain
[MAILSERVER]
; Port that the Mailserver will run on (default 25 but that needs root)
-MAILPORT=25
\ No newline at end of file
+MAILPORT=25
+[DATETIME]
+; The moment.js format you'd like your date to be formatted in
+DATEFORMAT="D.M.YYYY HH:mm"
\ No newline at end of file
diff --git a/web/api.php b/web/api.php
index bfbb9f2..aa9657c 100644
--- a/web/api.php
+++ b/web/api.php
@@ -60,6 +60,7 @@ switch($action)
{
$o['status'] = 'ok';
$o['type'] = 'admin';
+ $o['dateformat'] = $settings['DATEFORMAT'];
$emails = listEmailAdresses();
$emaillist = array();
diff --git a/web/index.html b/web/index.html
index 01471e1..a16805d 100644
--- a/web/index.html
+++ b/web/index.html
@@ -42,5 +42,6 @@
+