diff --git a/CHANGELOG b/CHANGELOG
index f6b1c73d8..03eb27ef4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@ CHANGELOG Roundcube Webmail
 - Support SMTP Delivery Status Notifications - RFC3461 (#1486142)
 - Use css sprite image for messages list
 - Add (different) attachment icon for messages of type multipart/report (#1486165)
+- Prevent from inserting empty link when composing HTML message (#1486944)
 
 RELEASE 0.4.2
 -------------
diff --git a/program/js/editor.js b/program/js/editor.js
index 1896e850f..2ee4ac1ce 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -18,46 +18,47 @@ function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
 {
   if (mode == 'identity')
     tinyMCE.init({
-      mode : 'textareas',
-      editor_selector : 'mce_editor',
-      apply_source_formatting : true,
-      theme : 'advanced',
-      language : editor_lang,
-      content_css : skin_path + '/editor_content.css',
+      mode: 'textareas',
+      editor_selector: 'mce_editor',
+      apply_source_formatting: true,
+      theme: 'advanced',
+      language: editor_lang,
+      content_css: skin_path + '/editor_content.css',
       plugins: 'paste,tabfocus',
-      theme_advanced_toolbar_location : 'top',
-      theme_advanced_toolbar_align : 'left',
-      theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr,link,unlink,code,forecolor',
-      theme_advanced_buttons2 : ',fontselect,fontsizeselect',
-      theme_advanced_buttons3 : '',
-      relative_urls : false,
-      remove_script_host : false,
-      gecko_spellcheck : true
+      theme_advanced_toolbar_location: 'top',
+      theme_advanced_toolbar_align: 'left',
+      theme_advanced_buttons1: 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr,link,unlink,code,forecolor',
+      theme_advanced_buttons2: ',fontselect,fontsizeselect',
+      theme_advanced_buttons3: '',
+      relative_urls: false,
+      remove_script_host: false,
+      gecko_spellcheck: true
     });
   else // mail compose
-    tinyMCE.init({ 
-      mode : 'textareas',
-      editor_selector : 'mce_editor',
-      accessibility_focus : false,
-      apply_source_formatting : true,
-      theme : 'advanced',
-      language : editor_lang,
-      plugins : 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality,tabfocus' + (spellcheck ? ',spellchecker' : ''),
-      theme_advanced_buttons1 : 'bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,outdent,indent,ltr,rtl,blockquote,|,forecolor,backcolor,fontselect,fontsizeselect',
-      theme_advanced_buttons2 : 'link,unlink,code,|,emotions,charmap,image,media,|,search' + (spellcheck ? ',spellchecker' : '') + ',undo,redo',
-      theme_advanced_buttons3 : '',
-      theme_advanced_toolbar_location : 'top',
-      theme_advanced_toolbar_align : 'left',
-      extended_valid_elements : 'font[face|size|color|style],span[id|class|align|style]',
-      content_css : skin_path + '/editor_content.css',
-      external_image_list_url : 'program/js/editor_images.js',
-      spellchecker_languages : (rcmail.env.spellcheck_langs ? rcmail.env.spellcheck_langs : 'Dansk=da,Deutsch=de,+English=en,Espanol=es,Francais=fr,Italiano=it,Nederlands=nl,Polski=pl,Portugues=pt,Suomi=fi,Svenska=sv'),
-      spellchecker_rpc_url : '?_task=utils&_action=spell&tiny=1',
-      gecko_spellcheck : true,
-      remove_script_host : false,
-      relative_urls : false,
-      rc_client : rcmail,
-      oninit : 'rcmail_editor_callback'
+    tinyMCE.init({
+      mode: 'textareas',
+      editor_selector: 'mce_editor',
+      accessibility_focus: false,
+      apply_source_formatting: true,
+      theme: 'advanced',
+      language: editor_lang,
+      plugins: 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality,tabfocus' + (spellcheck ? ',spellchecker' : ''),
+      theme_advanced_buttons1: 'bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,outdent,indent,ltr,rtl,blockquote,|,forecolor,backcolor,fontselect,fontsizeselect',
+      theme_advanced_buttons2: 'link,unlink,code,|,emotions,charmap,image,media,|,search' + (spellcheck ? ',spellchecker' : '') + ',undo,redo',
+      theme_advanced_buttons3: '',
+      theme_advanced_toolbar_location: 'top',
+      theme_advanced_toolbar_align: 'left',
+      extended_valid_elements: 'font[face|size|color|style],span[id|class|align|style]',
+      content_css: skin_path + '/editor_content.css',
+      external_image_list_url: 'program/js/editor_images.js',
+      spellchecker_languages: (rcmail.env.spellcheck_langs ? rcmail.env.spellcheck_langs : 'Dansk=da,Deutsch=de,+English=en,Espanol=es,Francais=fr,Italiano=it,Nederlands=nl,Polski=pl,Portugues=pt,Suomi=fi,Svenska=sv'),
+      spellchecker_rpc_url: '?_task=utils&_action=spell&tiny=1',
+      gecko_spellcheck: true,
+      remove_script_host: false,
+      relative_urls: false,
+      convert_urls: false, // #1486944
+      rc_client: rcmail,
+      oninit: 'rcmail_editor_callback'
     });
 }