- Fix incorrect row id parsing for LDAP contacts list (#1485784)

2 files changed, 3 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 1189913ad..561f22fa7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix incorrect row id parsing for LDAP contacts list (#1485784) 
 - Fix 'mode' parameter in sqlite DSN (#1485772)
 
 RELEASE 0.2.1
diff --git a/program/js/list.js b/program/js/list.js
index 8d8f9e965..1fe493ca9 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -104,7 +104,7 @@ init: function()
 init_row: function(row)
 {
   // make references in internal array and set event handlers
-  if (row && String(row.id).match(/rcmrow([a-z0-9\-_=]+)/i))
+  if (row && String(row.id).match(/rcmrow([a-z0-9\-_=\+\/]+)/i))
   {
     var p = this;
     var uid = RegExp.$1;
@@ -355,7 +355,7 @@ get_last_row: function()
     var rows = this.list.tBodies[0].rows;
 
     for(var i=rows.length-1; i>=0; i--)
-      if(rows[i].id && String(rows[i].id).match(/rcmrow([a-z0-9\-_=]+)/i) && this.rows[RegExp.$1] != null)
+      if(rows[i].id && String(rows[i].id).match(/rcmrow([a-z0-9\-_=\+\/]+)/i) && this.rows[RegExp.$1] != null)
 	return RegExp.$1;
     }