diff --git a/CHANGELOG b/CHANGELOG
index 4b125f6..82edca3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@
  * Added an empty line at the end of .htaccess to make it easier to modify. Reported by Mariosipad.
  * Modified the README and checkconfig.php to check for php5-json. Reported by Mariosipad.
  * Added a new bootstrap template.
+ * Handled properly the cancelling of a mail. Reported by coach0742.
 
 1.0.0RC1 - 20140404
   * Updated English, Spanish, German, Italian, Portuguese, Dutch translation files. Huge thanks to all to the translators.
diff --git a/util.js b/util.js
index 85f8e5d..6cb1be2 100644
--- a/util.js
+++ b/util.js
@@ -101,6 +101,10 @@ function sendToMailAddress (component, dataid) {
     var email = $.cookie ('email');
     if (!$.cookie ('email')) {
         email = window.prompt (currentData.c.i18n.customizeEmail, "");
+        if (email === null)
+        {
+            return;
+        }
         $.cookie ('email', email, { expires: 365 });
     }
     var url = 'sendtomail.php';