diff --git a/docker/rootfs/start.sh b/docker/rootfs/start.sh
index 92ed92b..23dc23e 100644
--- a/docker/rootfs/start.sh
+++ b/docker/rootfs/start.sh
@@ -25,19 +25,26 @@ 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
-echo "DATEFORMAT='D.M.YYYY HH:mm'" >> /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
 
@@ -45,4 +52,4 @@ echo ' [+] Starting Mailserver'
 python mailserver.py
 #nohup python /var/www/opentrashmail/python/mailserver.py &
 
-#tail -n 1 -f /var/log/nginx/*.log
\ No newline at end of file
+#tail -n 1 -f /var/log/nginx/*.log
diff --git a/python/mailserver.py b/python/mailserver.py
index 4fad814..0d62489 100644
--- a/python/mailserver.py
+++ b/python/mailserver.py
@@ -124,7 +124,7 @@ if __name__ == '__main__':
     else :
         Config = ConfigParser.ConfigParser()
         Config.read("../config.ini")
-        port = int(Config.get("MAILSERVER","PORT"))
+        port = int(Config.get("MAILSERVER","MAILPORT"))
 
     
 
diff --git a/web/api.php b/web/api.php
index 2300d04..aa9657c 100644
--- a/web/api.php
+++ b/web/api.php
@@ -75,7 +75,7 @@ switch($action)
                     }
                 }
                 if(is_array($emaillist))
-                    ksort($emaillist);
+                    krsort($emaillist);
                 $data = (count($emaillist)?$emaillist:array());
             }
 
diff --git a/web/js/opentrashmail.js b/web/js/opentrashmail.js
index 21a35c6..450ce7a 100644
--- a/web/js/opentrashmail.js
+++ b/web/js/opentrashmail.js
@@ -89,11 +89,16 @@ function updateEmailTable()
             var admin=false;
             if(data.type=="admin")
             {
-                clearInterval(timer);
+                //clearInterval(timer);
                 admin = true;
-                $('#tableheader').children(':eq(1)').after('<th scope="col">To</th>');
+				// Do not add the To header if one with the "to" class already exists 
+				if ( $('#tableheader').children(':eq(2)').hasClass("to") === false ) 
+				{
+					$('#tableheader').children(':eq(1)').after('<th scope="col" class="to">To</th>');
+				}
             }
 
+			$("#emailtable tr").remove(); // Empty all <tr> from the table so we don't stack
             if(Object.keys(data.emails).length>0)
                 for(em in data.emails)
                 {