diff --git a/CHANGELOG b/CHANGELOG
index 458886bca..f96d5905a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix auto-complete function hangs with plus sign (#1485815)
 - Fix AJAX requests errors handler (#1485000)
 - Speed up message list displaying on IE
 - Fix read/write database recognition (#1485811)
diff --git a/program/js/app.js b/program/js/app.js
index 627ddf5b6..43e0aa984 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2568,7 +2568,7 @@ function rcube_webmail()
     this.ksearch_value = q;
     
     this.display_message(this.get_label('searching'), 'loading', true);
-    this.http_post('autocomplete', '_search='+q);
+    this.http_post('autocomplete', '_search='+urlencode(q));
   };
 
   this.ksearch_query_results = function(results, search)