diff --git a/maloja/__pkginfo__.py b/maloja/__pkginfo__.py
index ba80c66..7e8f25c 100644
--- a/maloja/__pkginfo__.py
+++ b/maloja/__pkginfo__.py
@@ -5,7 +5,7 @@ author = {
 	"email":"maloja@dev.krateng.ch",
 	"github": "krateng"
 }
-version = 2,12,11
+version = 2,12,12
 versionstr = ".".join(str(n) for n in version)
 links = {
 	"pypi":"malojaserver",
diff --git a/maloja/data_files/config/settings/default.ini b/maloja/data_files/config/settings/default.ini
index 79415fc..87394b4 100644
--- a/maloja/data_files/config/settings/default.ini
+++ b/maloja/data_files/config/settings/default.ini
@@ -85,6 +85,7 @@ DISCOURAGE_CPU_HEAVY_STATS = false
 
 # Offset in hours to UTC
 TIMEZONE = 0
+TIME_FORMAT = "%d. %b %Y %I:%M %p" # use '%H:%M' instead of '%I:%M %p' for 24 hour clock
 
 [Fluff]
 
diff --git a/maloja/malojatime.py b/maloja/malojatime.py
index 6d37e50..0f4715f 100644
--- a/maloja/malojatime.py
+++ b/maloja/malojatime.py
@@ -535,7 +535,8 @@ def timestamp_desc(t,short=False):
 		return timeobject.strftime("%Y")
 	else:
 		timeobject = datetime.datetime.fromtimestamp(t,tz=TIMEZONE)
-		return timeobject.strftime("%d. %b %Y %I:%M %p")
+		format = get_settings("TIME_FORMAT")
+		return timeobject.strftime(format)