diff --git a/NEWS b/NEWS
index f00d6cd14..560a00f6a 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Bug fixes
  - [web] fixed progress indicator while importing cards or events and tasks
  - [web] improved detection of changes in CKEditor (#3839)
  - [web] fixed vCard generation for tags with no type (#3826)
+ - [web] only show the organizer field of an IMIP REPLY if one is defined
  - [eas] improve handling of email folders without a parent
  - [core] only consider SMTP addresses for AD's proxyAddresses (#3842)
  - [core] sogo-tool manage-eas now works with single store mode
diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.h b/UI/MailPartViewers/UIxMailPartICalViewer.h
index c5acd7e5b..7ecc4a394 100644
--- a/UI/MailPartViewers/UIxMailPartICalViewer.h
+++ b/UI/MailPartViewers/UIxMailPartICalViewer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2015 Inverse inc.
+ * Copyright (C) 2007-2016 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.m b/UI/MailPartViewers/UIxMailPartICalViewer.m
index 548d0991b..29dc5b7ee 100644
--- a/UI/MailPartViewers/UIxMailPartICalViewer.m
+++ b/UI/MailPartViewers/UIxMailPartICalViewer.m
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2006-2015 Inverse inc.
+  Copyright (C) 2006-2016 Inverse inc.
 
   This file is part of SOGo.
 
@@ -400,6 +400,17 @@
 }
 
 /* derived fields */
+- (BOOL) hasOrganizer
+{
+  iCalPerson *organizer;
+
+  organizer = [[self authorativeEvent] organizer];
+
+  if ([organizer isVoid])
+    return NO;
+
+  return YES;
+}
 
 - (NSString *) organizerDisplayName
 {
@@ -407,10 +418,7 @@
   NSString *value;
 
   organizer = [[self authorativeEvent] organizer];
-  if ([organizer isVoid])
-    value = @"[todo: no organizer set, use 'from']";
-  else
-    value = [self _personForDisplay: organizer];
+  value = [self _personForDisplay: organizer];
 
   return value;
 }
diff --git a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
index fa1d81482..7f31d0989 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
@@ -233,12 +233,14 @@
 
 
         <!-- EVENT'S METADATA (time, organizer, attendees, etc.) -->
-        <div class="pseudo-input-container">
-          <label class="pseudo-input-label"><var:string label:value="Organizer"/></label>
-          <div>
-            <var:string value="organizerDisplayName"/>
+	<var:if condition="hasOrganizer" const:value="true">
+          <div class="pseudo-input-container">
+            <label class="pseudo-input-label"><var:string label:value="Organizer"/></label>
+            <div>
+              <var:string value="organizerDisplayName"/>
+            </div>
           </div>
-        </div>
+	</var:if>
 
         <div class="pseudo-input-container">
           <label class="pseudo-input-label"><var:string label:value="Time"/></label>