diff --git a/program/js/app.js b/program/js/app.js
index 3518712ed..615f94cae 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -767,7 +767,7 @@ function rcube_webmail()
 
       case 'always-load':
         if (this.env.uid && this.env.sender) {
-          this.add_contact(urlencode(this.env.sender));
+          this.add_contact(this.env.sender);
           setTimeout(function(){ ref.command('load-images'); }, 300);
           break;
         }
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index ee17b3a3f..1742eee66 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1340,7 +1340,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
       if ($addicon && $_SESSION['writeable_abook']) {
         $address = html::span(null, $address . html::a(array(
             'href' => "#add",
-            'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, urlencode($string)),
+            'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, $string),
             'title' => rcube_label('addtoaddressbook'),
             'class' => 'rcmaddcontact',
           ),