diff --git a/css/style.css b/css/style.css
index 28a9eb2c..f38c64bb 100644
--- a/css/style.css
+++ b/css/style.css
@@ -169,7 +169,7 @@ button.category{margin:0 3px;}
   float:right;
 }
 
-#controls .settings.timezonesettings > .chzn-container {
+.settings.timezonesettings > .chzn-container {
   position:relative;
   top:0.5em;
 }
diff --git a/share.php b/share.php
index 140f40cf..ba657772 100644
--- a/share.php
+++ b/share.php
@@ -161,6 +161,7 @@ if (isset($rootLinkItem)) {
   } elseif ($linkItem['item_type'] === 'event') {
     OCP\Util::addStyle('calendar', 'style');
     OCP\Util::addStyle('calendar', 'tooltips');
+    OCP\Util::addscript('calendar','settings');
     OCP\App::setActiveNavigationEntry('calendar_index');
     $tmpl = new OCP\Template('calendar', 'event', 'base');
     $tmpl->assign('link_shared_event', $linkItem);
diff --git a/templates/event.php b/templates/event.php
index ce4f5e4b..d5075e89 100644
--- a/templates/event.php
+++ b/templates/event.php
@@ -225,6 +225,8 @@ $tmpl = new OCP\Template('calendar', 'part.showevent');
 
 $tmpl->assign('link_shared_event', $_['link_shared_event']);
 $tmpl->assign('link_shared_event_url', $_['link_shared_event_url']);
+$tmpl->assign('timezone', $_['timezone']);
+    $tmpl->assign('timezones', $_['timezones']);
 
 $tmpl->assign('eventid', $id);
 $tmpl->assign('permissions', $permissions);
diff --git a/templates/part.showevent.php b/templates/part.showevent.php
index 676c3d92..07410cdf 100644
--- a/templates/part.showevent.php
+++ b/templates/part.showevent.php
@@ -279,5 +279,26 @@
 </div>
 <!--<div id="tabs-3">//Alarm</div>
 <div id="tabs-4">//Attendees</div>-->
-
+<hr/>
+<div class="settings timezonesettings">
+  <label for="timezone"><?php p($l->t('Timezone')) ?></label>
+  <select id="timezone" name="timezone">
+  <?php
+  $continent = '';
+  foreach($_['timezones'] as $timezone):
+    $ex=explode('/', $timezone, 2);//obtain continent,city
+    if (!isset($ex[1])) {
+      $ex[1] = $ex[0];
+      $ex[0] = "Other";
+    }
+    if ($continent!=$ex[0]):
+      if ($continent!="") print_unescaped('</optgroup>');
+      print_unescaped('<optgroup label="'.OC_Util::sanitizeHTML($ex[0]).'">');
+    endif;
+    $city=strtr($ex[1], '_', ' ');
+    $continent=$ex[0];
+    print_unescaped('<option value="'.OC_Util::sanitizeHTML($timezone).'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.OC_Util::sanitizeHTML($city).'</option>');
+  endforeach;?>
+  </select>
+</div>
 </div>
\ No newline at end of file