diff --git a/ChangeLog b/ChangeLog
index 00401f0c2..3beb9b626 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-07-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreCalendarFolder.m (-createMessage): attach a
+	WOContext to the newEntry in order to enable page templates
+	resolution when notifications are sent.
+
 	* OpenChange/MAPIApplication.m (-init): a WEResourceManager is
 	setup for the application so that page templates can be properly
 	be initialized.
diff --git a/OpenChange/MAPIStoreCalendarFolder.m b/OpenChange/MAPIStoreCalendarFolder.m
index 71dcddb4e..f35918596 100644
--- a/OpenChange/MAPIStoreCalendarFolder.m
+++ b/OpenChange/MAPIStoreCalendarFolder.m
@@ -35,6 +35,7 @@
 #import "MAPIStoreCalendarContext.h"
 #import "MAPIStoreCalendarMessage.h"
 #import "MAPIStoreCalendarMessageTable.h"
+#import "MAPIStoreUserContext.h"
 #import "NSString+MAPIStore.h"
 
 #import "MAPIStoreCalendarFolder.h"
@@ -67,6 +68,8 @@
   newEntry = [SOGoAppointmentObject objectWithName: name
                                        inContainer: sogoObject];
   [newEntry setIsNew: YES];
+  /* the WOContext is required here for resolving notification pages */
+  [newEntry setContext: [[self userContext] woContext]];
   newMessage = [MAPIStoreCalendarMessage mapiStoreObjectWithSOGoObject: newEntry
                                                            inContainer: self];