diff --git a/SoObjects/SOGo/SOGoSieveManager.m b/SoObjects/SOGo/SOGoSieveManager.m
index 7cd1d3dc5..9e41f9b63 100644
--- a/SoObjects/SOGo/SOGoSieveManager.m
+++ b/SoObjects/SOGo/SOGoSieveManager.m
@@ -1220,6 +1220,7 @@ static NSString *sieveScriptName = @"sogo";
     {
       // BOOL alwaysSend;
       NSString *notify;
+      NSString *message;
       id addresses;
       int i;
 
@@ -1232,12 +1233,14 @@ static NSString *sieveScriptName = @"sogo";
       if ([addresses isKindOfClass: [NSString class]])
         addresses = [addresses componentsSeparatedByString: @","];
 
+      message = [values objectForKey: @"notificationMessage"];
+
       for (i = 0; i < [addresses count]; i++)
         {
           v = [addresses objectAtIndex: i];
           if (v && [v length] > 0)
             {
-              notify = [NSString stringWithFormat: @"notify \"mailto:%@\";\r\n", v];
+              notify = [NSString stringWithFormat: @"notify :message \"%@\"\r\n       \"mailto:%@\";\r\n", message, v];
 
               // if (alwaysSend)
               //   [script insertString: notify  atIndex: 0];
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index 02da52e25..542c39896 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -82,6 +82,8 @@
 
 /* notification */
 "Notify incoming messsages" = "Notify incoming messsages";
+"Notification Message Sent" = "Notification message sent";
+"Notification Message" = "Notification of new message on %{0}";
 
 /* d & t */
 "Time Zone" = "Time Zone";
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index c59e693f1..dc4db8c84 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -82,6 +82,8 @@
 
 /* notify messages */
 "Notify incoming messsages" = "Notifier les messages entrants";
+"Notification Message Sent" = "Message de notification envoyé";
+"Notification Message" = "Nouveau message reçu sur %{0}";
 
 /* d & t */
 "Time Zone" = "Fuseau horaire";
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index dcc994197..31084163d 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -1437,11 +1437,20 @@
                       </md-autocomplete>
                     </md-chips>
                 </md-input-container>
+
+                <md-input-container class="md-block md-flex md-input-has-placeholder">
+                  <label><var:string label:value="Notification Message Sent"/></label>
+                  <textarea name="notificationMessage"
+                            id="notificationMessage"
+                            ng-model="app.preferences.defaults.Notification.notificationMessage"
+                            ng-required="app.preferences.defaults.Notification.enabled == 1">
+                  </textarea>
+                </md-input-container>
               </div>
             </div>
           </md-tab>
         </var:if>
-        <!-- END OF MAIL > FORWARD -->
+        <!-- END OF MAIL > NOTIFICATIONS -->
 
       </md-tabs>
     </var:if>
diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js
index 3d05a1a4d..badaa22e8 100644
--- a/UI/WebServerResources/js/Preferences/PreferencesController.js
+++ b/UI/WebServerResources/js/Preferences/PreferencesController.js
@@ -20,6 +20,8 @@
       this.autocomplete = {forward: [], notification: []};
       this.mailLabelKeyRE = new RegExp(/^(?!^_\$)[^(){} %*\"\\\\]*?$/);
       this.emailSeparatorKeys = Preferences.defaults.emailSeparatorKeys;
+      if (!Preferences.defaults.Notification.notificationMessage)
+        this.preferences.defaults.Notification.notificationMessage = l('Notification Message', $window.defaultEmailAddresses);
       if (Preferences.defaults.SOGoMailAutoMarkAsReadMode == 'delay')
         this.mailAutoMarkAsReadDelay = Math.max(1, this.preferences.defaults.SOGoMailAutoMarkAsReadDelay);
       else
@@ -724,7 +726,7 @@
         });
       }
       else {
-        recipient = contact.$shortFormat();
+        recipient = contact.$$email;
       }
       
       if (recipient)