diff --git a/ActiveSync/iCalEvent+ActiveSync.m b/ActiveSync/iCalEvent+ActiveSync.m
index b33d6fa..c7e33bf 100644
--- a/ActiveSync/iCalEvent+ActiveSync.m
+++ b/ActiveSync/iCalEvent+ActiveSync.m
@@ -111,6 +111,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
   NSTimeZone *userTimeZone;
   userTimeZone = [[[context activeUser] userDefaults] timeZone];
+  meetingStatus = 0;
 
   s = [NSMutableString string];
   
@@ -160,8 +161,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   // Organizer and other invitations related properties
   if ((organizer = [self organizer]))
     {
-      meetingStatus = 1;  // meeting and the user is the meeting organizer.
-      o = [organizer rfc822Email];
+      if ((o = [organizer rfc822Email]) &&
+          ([self userIsOrganizer: [context activeUser]] || [[context activeUser] hasEmail: o]))
+         meetingStatus = 1;  // meeting and the user is the meeting organizer.
+
       if (![self recurrenceId] && [o length])
         {
           [s appendFormat: @"<Organizer_Email xmlns=\"Calendar:\">%@</Organizer_Email>", o];