diff --git a/src/java/davmail/ui/SettingsFrame.java b/src/java/davmail/ui/SettingsFrame.java
index ddeba3c1..7cb9e20e 100644
--- a/src/java/davmail/ui/SettingsFrame.java
+++ b/src/java/davmail/ui/SettingsFrame.java
@@ -90,6 +90,7 @@ public class SettingsFrame extends JFrame {
     JComboBox wireLoggingLevelField;
     JTextField logFilePathField;
 
+    JCheckBox caldavEditNotificationsField;
     JTextField caldavAlarmSoundField;
     JCheckBox forceActiveSyncUpdateCheckBox;
     JTextField defaultDomainField;
@@ -394,9 +395,11 @@ public class SettingsFrame extends JFrame {
     }
 
     protected JPanel getOtherSettingsPanel() {
-        JPanel otherSettingsPanel = new JPanel(new GridLayout(6, 2));
+        JPanel otherSettingsPanel = new JPanel(new GridLayout(7, 2));
         otherSettingsPanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_OTHER")));
 
+        caldavEditNotificationsField = new JCheckBox();
+        caldavEditNotificationsField.setSelected(Settings.getBooleanProperty("davmail.caldavEditNotifications"));
         caldavAlarmSoundField = new JTextField(Settings.getProperty("davmail.caldavAlarmSound"), 15);
         forceActiveSyncUpdateCheckBox = new JCheckBox();
         forceActiveSyncUpdateCheckBox.setSelected(Settings.getBooleanProperty("davmail.forceActiveSyncUpdate"));
@@ -408,6 +411,8 @@ public class SettingsFrame extends JFrame {
         enableEwsCheckBox = new JCheckBox();
         enableEwsCheckBox.setSelected(Settings.getBooleanProperty("davmail.enableEws", false));
 
+        addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_CALDAV_EDIT_NOTIFICATIONS"), caldavEditNotificationsField,
+                BundleMessage.format("UI_CALDAV_EDIT_NOTIFICATIONS_HELP"));
         addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_CALDAV_ALARM_SOUND"), caldavAlarmSoundField,
                 BundleMessage.format("UI_CALDAV_ALARM_SOUND_HELP"));
         addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_FORCE_ACTIVESYNC_UPDATE"), forceActiveSyncUpdateCheckBox,
@@ -513,6 +518,7 @@ public class SettingsFrame extends JFrame {
         certHashField.setText(Settings.getProperty("davmail.server.certificate.hash"));
         disableUpdateCheck.setSelected(Settings.getBooleanProperty(("davmail.disableUpdateCheck")));
 
+        caldavEditNotificationsField.setSelected(Settings.getBooleanProperty("davmail.caldavEditNotifications"));
         caldavAlarmSoundField.setText(Settings.getProperty("davmail.caldavAlarmSound"));
         forceActiveSyncUpdateCheckBox.setSelected(Settings.getBooleanProperty("davmail.forceActiveSyncUpdate"));
         defaultDomainField.setText(Settings.getProperty("davmail.defaultDomain"));
@@ -650,6 +656,7 @@ public class SettingsFrame extends JFrame {
                 Settings.setProperty("davmail.server.certificate.hash", certHashField.getText());
                 Settings.setProperty("davmail.disableUpdateCheck", String.valueOf(disableUpdateCheck.isSelected()));
 
+                Settings.setProperty("davmail.caldavEditNotifications", String.valueOf(caldavEditNotificationsField.isSelected()));
                 Settings.setProperty("davmail.caldavAlarmSound", String.valueOf(caldavAlarmSoundField.getText()));
                 Settings.setProperty("davmail.forceActiveSyncUpdate", String.valueOf(forceActiveSyncUpdateCheckBox.isSelected()));
                 Settings.setProperty("davmail.defaultDomain", String.valueOf(defaultDomainField.getText()));
diff --git a/src/java/davmailmessages.properties b/src/java/davmailmessages.properties
index 2f350827..1b1e1dd5 100644
--- a/src/java/davmailmessages.properties
+++ b/src/java/davmailmessages.properties
@@ -271,3 +271,5 @@ UI_CC_HELP=Copy recipients
 UI_SUBJECT=Subject: 
 UI_SUBJECT_HELP=Caldav notification subject
 UI_NOTIFICATION_BODY=Caldav notification comment
+UI_CALDAV_EDIT_NOTIFICATIONS=Edit Caldav notifications:
+UI_CALDAV_EDIT_NOTIFICATIONS_HELP=Enable interactive Caldav edit notification window
diff --git a/src/java/davmailmessages_fr.properties b/src/java/davmailmessages_fr.properties
index abb2cd04..d5fd68e7 100644
--- a/src/java/davmailmessages_fr.properties
+++ b/src/java/davmailmessages_fr.properties
@@ -20,7 +20,7 @@ EXCEPTION_INVALID_MESSAGE_CONTENT=Contenu du message invalide : {0}
 EXCEPTION_INVALID_MESSAGE_URL=URL de message invalide : {0}
 EXCEPTION_INVALID_RECIPIENT=Destinataire invalide : {0}
 EXCEPTION_INVALID_REQUEST=Requête invalide {0}
-EXCEPTION_INVALID_SEARCH_PARAMETERS=Paremètres de recherche invalides : {0}
+EXCEPTION_INVALID_SEARCH_PARAMETERS=Paramètres de recherche invalides : {0}
 EXCEPTION_NETWORK_DOWN=Toutes les interfaces réseaux sont indisponibles ou serveur non joignable !
 EXCEPTION_UNABLE_TO_CREATE_MESSAGE=Impossible de créer le message {0} : {1}{2}{3}
 EXCEPTION_UNABLE_TO_GET_FOLDER=Impossible d''obtenir le dossier {0}
@@ -270,3 +270,6 @@ UI_TO_HELP=Destinataires
 UI_NOTIFICATION_BODY=Commentaire notification Caldav
 UI_CC=Copie à : 
 UI_CC_HELP=Destinataires en copie
+UI_CALDAV_EDIT_NOTIFICATIONS=Edition notifications Caldav :
+UI_CALDAV_EDIT_NOTIFICATIONS_HELP=Activer le fenêtre d'édition interactive des notifications
+
diff --git a/src/site/xdoc/gettingstarted.xml b/src/site/xdoc/gettingstarted.xml
index 564649a6..b11ce1be 100644
--- a/src/site/xdoc/gettingstarted.xml
+++ b/src/site/xdoc/gettingstarted.xml
@@ -86,6 +86,11 @@
                     <td>Allow remote connections to the gateway (server mode)</td>
                     <td>false</td>
                 </tr>
+                <tr>
+                    <td>Edit Caldav notifications</td>
+                    <td>Enable interactive Caldav edit notification window</td>
+                    <td>false</td>
+                </tr>
                 <tr>
                     <td>Force Active Sync update</td>
                     <td>Use double event update to trigger ActiveSync mobile phones sync</td>