diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js
index d93f570c..97eca85f 100755
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@@ -469,6 +469,12 @@ Module.register("calendar", {
 			var calendar = this.calendarData[c];
 			for (var e in calendar) {
 				var event = JSON.parse(JSON.stringify(calendar[e])); // clone object
+
+				// correct data for the current timezone
+                   		var offset = - ((new Date()).getTimezoneOffset() * 60 * 1000);
+                   		event.startDate = (event.startDate - offset);
+                   		event.endDate = (event.endDate - offset);
+				
 				if(event.endDate < now) {
 					continue;
 				}