diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
index b268de88f..a949236e9 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
@@ -115,8 +115,10 @@
                                         <ul class="addon-list">
                                             {{ pos.subevent.name }} &middot; {{ pos.subevent.get_date_range_display }}
                                             {% if pos.event.settings.show_times %}
-                                                <span class="fa fa-clock-o"></span>
-                                                {{ pos.subevent.date_from|date:"TIME_FORMAT" }}
+                                                <span data-time="{{ pos.subevent.date_from.isoformat }}" data-timezone="{{ request.event.timezone }}">
+                                                    <span class="fa fa-clock-o"></span>
+                                                    {{ pos.subevent.date_from|date:"TIME_FORMAT" }}
+                                                </span>
                                             {% endif %}
                                         </ul>
                                     </div>
diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
index 2c458049a..1eff90790 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
@@ -28,8 +28,10 @@
             {% if line.subevent %}
                 <br /><span class="fa fa-calendar fa-fw"></span> {{ line.subevent.name }} &middot; {{ line.subevent.get_date_range_display }}
                 {% if event.settings.show_times %}
-                    <span class="fa fa-clock-o"></span>
-                    {{ line.subevent.date_from|date:"TIME_FORMAT" }}
+                    <span data-time="{{ line.subevent.date_from.isoformat }}" data-timezone="{{ request.event.timezone }}" data-time-short>
+                        <span class="fa fa-clock-o"></span>
+                        {{ line.subevent.date_from|date:"TIME_FORMAT" }}
+                    </span>
                 {% endif %}
             {% endif %}
 
diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_list.html b/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_list.html
index dbe32b4c8..8e3e8a5f0 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_list.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_list.html
@@ -11,8 +11,10 @@
                 <span class="fa fa-calendar"></span>
                 {{ subev.get_date_range_display }}
                 {% if event.settings.show_times %}
-                    <span class="fa fa-clock-o"></span>
-                    {{ subev.date_from|date:"TIME_FORMAT" }}
+                    <span data-time="{{ subev.date_from.isoformat }}" data-timezone="{{ event.timezone }}" data-time-short>
+                        <span class="fa fa-clock-o"></span>
+                        {{ subev.date_from|date:"TIME_FORMAT" }}
+                    </span>
                 {% endif %}
             </div>
             <div class="col-md-2 text-right flip">
diff --git a/src/pretix/presale/templates/pretixpresale/fragment_calendar.html b/src/pretix/presale/templates/pretixpresale/fragment_calendar.html
index 437de1759..233a0c199 100644
--- a/src/pretix/presale/templates/pretixpresale/fragment_calendar.html
+++ b/src/pretix/presale/templates/pretixpresale/fragment_calendar.html
@@ -51,17 +51,15 @@
                                         {% endif %}
                                         {% if not event.continued %}
                                             {% if event.time %}
-                                                <span class="event-time">
+                                                <span class="event-time" data-time="{{ event.event.date_from.isoformat }}" data-timezone="{{ event.timezone }}" data-time-short>
                                                     <span class="fa fa-clock-o"></span>
                                                     {% if not show_names|default_if_none:True %}
                                                         <strong>
                                                     {% endif %}
                                                     {{ event.time|date:"TIME_FORMAT" }}
-                                                    {% if event.time_end %}
+                                                    {% if event.event.settings.show_date_to and event.time_end %}
                                                         – {{ event.time_end|date:"TIME_FORMAT" }}
                                                     {% endif %}
-                                                    {% if event.event.settings.show_date_to and event. %}
-                                                    {% endif %}
                                                     {% if not show_names|default_if_none:True %}
                                                         </strong>
                                                     {% endif %}
diff --git a/src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html b/src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html
index c164ec9ab..52203a929 100644
--- a/src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html
+++ b/src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html
@@ -37,7 +37,7 @@
                         {% endif %}
                         {% if not event.continued %}
                             {% if event.time %}
-                                <span class="event-time">
+                                <span class="event-time" data-time="{{ event.event.date_from.isoformat }}" data-timezone="{{ event.timezone }}" data-time-short>
                                     <span class="fa fa-clock-o"></span>
                                     {% if not show_names|default_if_none:True %}
                                         <strong>
diff --git a/src/pretix/presale/templates/pretixpresale/organizers/index.html b/src/pretix/presale/templates/pretixpresale/organizers/index.html
index 4d1ba2ab5..2dc8e74b7 100644
--- a/src/pretix/presale/templates/pretixpresale/organizers/index.html
+++ b/src/pretix/presale/templates/pretixpresale/organizers/index.html
@@ -84,7 +84,7 @@
                         {{ e.daterange|default:e.get_date_range_display }}
                         {% if e.settings.show_times and not e.has_subevents %}
                             {% timezone e.tzname %}
-                                <br><small class="text-muted">
+                                <br><small class="text-muted" data-time="{{ e.date_from.isoformat }}" data-timezone="{{ e.tzname }}">
                                 {{ e.date_from|date:"TIME_FORMAT" }}
                                 {% if e.settings.show_date_to and e.date_to and e.date_to.date == e.date_from.date %}
                                     – {{ e.date_to|date:"TIME_FORMAT" }}
diff --git a/src/pretix/static/pretixpresale/js/ui/main.js b/src/pretix/static/pretixpresale/js/ui/main.js
index 6e470864b..5b5eddfb3 100644
--- a/src/pretix/static/pretixpresale/js/ui/main.js
+++ b/src/pretix/static/pretixpresale/js/ui/main.js
@@ -424,7 +424,7 @@ $(function () {
     }
 
     var local_tz = moment.tz.guess()
-    $("span[data-timezone]").each(function() {
+    $("span[data-timezone], small[data-timezone]").each(function() {
         var t = moment.tz($(this).attr("data-time"), $(this).attr("data-timezone"))
         var tz = moment.tz.zone($(this).attr("data-timezone"))
 
@@ -432,17 +432,22 @@ $(function () {
             'title': gettext("Time zone:") + " " + tz.abbr(t)
         });
         if (t.tz(tz.name).format() !== t.tz(local_tz).format()) {
-            var $add = $("<span>").addClass("text-muted")
+            var $add = $("<span>")
             $add.append($("<span>").addClass("fa fa-globe"))
-            $add.append(" " + gettext("Your local time:") + " ")
-            if (t.tz(tz.name).format("YYYY-MM-DD") != t.tz(local_tz).format("YYYY-MM-DD")) {
-                $add.append(t.tz(local_tz).format($("body").attr("data-datetimeformat")))
+            if ($(this).is("[data-time-short]")) {
+                $add.append($("<em>").text(" " + t.tz(local_tz).format($("body").attr("data-timeformat"))))
             } else {
-                $add.append(t.tz(local_tz).format($("body").attr("data-timeformat")))
+                $add.addClass("text-muted")
+                $add.append(" " + gettext("Your local time:") + " ")
+                if (t.tz(tz.name).format("YYYY-MM-DD") != t.tz(local_tz).format("YYYY-MM-DD")) {
+                    $add.append(t.tz(local_tz).format($("body").attr("data-datetimeformat")))
+                } else {
+                    $add.append(t.tz(local_tz).format($("body").attr("data-timeformat")))
+                }
             }
             $add.insertAfter($(this));
             $add.tooltip({
-                'title': gettext("Time zone:") + " " + moment.tz.zone(local_tz).abbr(t)
+                'title': gettext("Time zone:") + " " + moment.tz.zone(local_tz).abbr(t),
             });
         }
     });