=== modified file 'src/dates_callbacks.c'
--- old/src/dates_callbacks.c	2009-07-23 13:31:05 +0000
+++ new/src/dates_callbacks.c	2011-03-29 01:53:33 +0000
@@ -93,7 +93,9 @@
 void
 dates_today_cb (GtkButton *button, DatesData *data)
 {
-    icaltimetype today = icaltime_today ();
+    icaltimezone *zone =dates_view_get_zone (data->view);
+    icaltimetype today = icaltime_current_time_with_zone (zone);
+    icaltime_adjust (&today, 0, today.hour * -1, today.minute * -1, today.second * -1);
     dates_view_set_date (data->view, &today);
 }
 

=== modified file 'src/dates_view.c'
--- old/src/dates_view.c	2009-07-23 13:31:05 +0000
+++ new/src/dates_view.c	2011-03-29 01:53:33 +0000
@@ -1429,6 +1429,7 @@
 	//priv->adjust = GTK_ADJUSTMENT (gtk_adjustment_new (8, 0, 13, 1, 1, 1));
 	priv->date = g_new (icaltimetype, 1);
 	*priv->date = icaltime_today ();
+	icaltime_adjust (priv->date, 0, (*priv->date).hour * -1, (*priv->date).minute * -1, (*priv->date).second * -1);
 	dates_view_get_visible_span (view, &priv->start, &priv->end);
 	dates_view_get_visible_cspan (view, &priv->cstart, &priv->cend);
 	
@@ -5448,6 +5449,25 @@
 	return priv->date;
 }
 
+/** dates_view_get_zone:
+ * @view:	The #DatesView widget to get the selected zone of
+ *
+ * Retrieves the current active zone of @view
+ *
+ * Return value: @view's active zone
+ **/
+const icaltimezone *
+dates_view_get_zone (DatesView *view)
+{
+	DatesViewPrivate *priv;
+
+	g_return_val_if_fail (DATES_IS_VIEW (view), NULL);
+
+	priv = DATES_VIEW_GET_PRIVATE (view);
+
+	return priv->zone;
+}
+
 /** dates_view_get_use_list:
  * @view:	The #DatesView widget to get the view preference of
  *

=== modified file 'src/dates_view.h'
--- old/src/dates_view.h	2008-02-27 12:04:28 +0000
+++ new/src/dates_view.h	2011-03-29 01:53:33 +0000
@@ -103,6 +103,7 @@
 guint 		dates_view_get_visible_days 	(DatesView *view);
 guint 		dates_view_get_visible_hours 	(DatesView *view);
 const icaltimetype *dates_view_get_date 	(DatesView *view);
+const icaltimezone *dates_view_get_zone 	(DatesView *view);
 gboolean	dates_view_get_use_list		(DatesView *view);
 gboolean	dates_view_get_use_24h		(DatesView *view);
 void            dates_view_get_visible_span     (DatesView *view,

