diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 13f9b252..e44d618d 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -502,6 +502,7 @@ function rcube_calendar_ui(settings)
       event_attendees = [];
       attendees_list = $('#edit-attendees-table > tbody').html('');
       $('#edit-attendees-notify')[(notify.checked && organizer ? 'show' : 'hide')]();
+      $('#edit-localchanges-warning')[(has_attendees(event) && !organizer ? 'show' : 'hide')]();
 
       var load_attendees_tab = function()
       {
diff --git a/plugins/calendar/skins/default/calendar.css b/plugins/calendar/skins/default/calendar.css
index ddeda06d..febc8b03 100644
--- a/plugins/calendar/skins/default/calendar.css
+++ b/plugins/calendar/skins/default/calendar.css
@@ -509,7 +509,7 @@ td.topalign {
 	padding: 0 0.5em 0.5em 0.5em;
 }
 
-.edit-recurring-warning,
+.event-dialog-message,
 .event-update-confirm .message {
 	margin-top: 0.5em;
 	padding: 0.8em;
@@ -517,7 +517,7 @@ td.topalign {
 	border: 1px solid #C2D071;
 }
 
-.edit-recurring-warning .message,
+.event-dialog-message .message,
 .event-update-confirm .message {
 	margin-bottom: 0.5em;
 }
@@ -530,13 +530,13 @@ td.topalign {
 	padding-left: 30px;
 }
 
-.edit-recurring-warning span.ui-icon,
+.event-dialog-message span.ui-icon,
 .event-update-confirm span.ui-icon {
 	float: left;
 	margin: 0 7px 20px 0;
 }
 
-.edit-recurring-warning label,
+.event-dialog-message label,
 .event-update-confirm label {
 	min-width: 3em;
 	padding-right: 1em;
diff --git a/plugins/calendar/skins/default/templates/calendar.html b/plugins/calendar/skins/default/templates/calendar.html
index 87253b72..b4d67809 100644
--- a/plugins/calendar/skins/default/templates/calendar.html
+++ b/plugins/calendar/skins/default/templates/calendar.html
@@ -186,8 +186,9 @@
     </div>
   </form>
 
-  <roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" style="display:none" />
-  <roundcube:object name="plugin.edit_recurring_warning" class="edit-recurring-warning" style="display:none" />
+  <roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="event-dialog-message" style="display:none" />
+  <roundcube:object name="plugin.edit_recurring_warning" class="event-dialog-message edit-recurring-warning" style="display:none" />
+  <div id="edit-localchanges-warning" class="event-dialog-message" style="display:none"><roundcube:label name="calendar.localchangeswarning" /></div>
 </div>
 
 <div id="eventfreebusy" class="uidialog">