diff --git a/horde/config/prefs.php b/horde/config/prefs.php
index 0977e1c1336..91a3a22061b 100644
--- a/horde/config/prefs.php
+++ b/horde/config/prefs.php
@@ -364,7 +364,8 @@
     'desc' => _("Set your preferred language, timezone and date preferences."),
     'members' => array(
         'language', 'sending_charset', 'timezone', 'twentyFour', 'date_format',
-        'date_format_mini', 'time_format', 'first_week_day'
+        'date_format_mini', 'time_format', 'time_format_mini',
+        'first_week_day'
     )
 );
 
@@ -482,10 +483,19 @@
         '%X' => strftime('%X') . ' (' . _("Default") . ')',
         '%H:%M:%S' => strftime('%H:%M:%S') . ' (' . _("24-hour format") . ')',
         '%l:%M:%S %p' => strftime('%l:%M:%S %p'),
-        '%R' => strftime('%R') . ' (' . _("24-hour format") . ')',
+    ),
+    'desc' => _("Choose how to display times (full format):")
+);
+
+$_prefs['time_format_mini'] = array(
+    'value' => '%X',
+    'type' => 'enum',
+    'enum' => array(
+        '%X' => strftime('%X') . ' (' . _("Default") . ')',
+        '%H:%M' => strftime('%H:%M') . ' (' . _("24-hour format") . ')',
         '%l:%M %p' => strftime('%l:%M %p'),
     ),
-    'desc' => _("Choose how to display times:")
+    'desc' => _("Choose how to display times (abbreviated format):")
 );
 
 $_prefs['first_week_day'] = array(
diff --git a/horde/docs/CHANGES b/horde/docs/CHANGES
index a07a028ff3a..3dc30c5c8a1 100644
--- a/horde/docs/CHANGES
+++ b/horde/docs/CHANGES
@@ -2,6 +2,7 @@
 v5.2.0RC3
 ---------
 
+[mms] Add the 'time_format_mini' preference.
 [mms] Add configuration to allow for SMTP authentication if the current Horde
       access does not have an authenticated user.
 
diff --git a/horde/docs/UPGRADING b/horde/docs/UPGRADING
index 46861d4f7ce..69d9c298b21 100644
--- a/horde/docs/UPGRADING
+++ b/horde/docs/UPGRADING
@@ -112,6 +112,12 @@ Read the comments at the top of the hooks.php file for descriptions of each
 hook.
 
 
+Preferences (prefs.php)
+-----------------------
+
+The 'time_format_mini' preference has been added.
+
+
 Registry Options (registry.php)
 -------------------------------
 
diff --git a/horde/package.xml b/horde/package.xml
index 0c4f51693e5..e06dca7f3ee 100644
--- a/horde/package.xml
+++ b/horde/package.xml
@@ -3932,6 +3932,7 @@
    <date>2014-07-01</date>
    <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
    <notes>
+* [mms] Add the &apos;time_format_mini&apos; preference.
 * [mms] Add configuration to allow for SMTP authentication if the current Horde access does not have an authenticated user.
    </notes>
   </release>