diff --git a/controller/smscontroller.php b/controller/smscontroller.php
index c28ad16..2560f5c 100644
--- a/controller/smscontroller.php
+++ b/controller/smscontroller.php
@@ -215,19 +215,13 @@ class SmsController extends Controller {
 		$photos = array();
 
 		foreach ($phoneList as $number => $ts) {
-			$fmtPN = preg_replace("#[ ]#","/", $number);
+			$fmtPN = preg_replace("#[ ]#","", $number);
 			if (isset($contactsSrc[$fmtPN])) {
-				$fmtPN2 = preg_replace("#[/]#","", $fmtPN);
 				$contacts[$fmtPN] = $contactsSrc[$fmtPN];
-				$contacts[$fmtPN2] = $contactsSrc[$fmtPN];
 
 				if (isset($photosSrc[$contacts[$fmtPN]])) {
 					$photos[$contacts[$fmtPN]] = $photosSrc[$contacts[$fmtPN]];
 				}
-
-				if (isset($photosSrc[$contacts[$fmtPN2]])) {
-					$photos[$contacts[$fmtPN2]] = $photosSrc[$contacts[$fmtPN2]];
-				}
 			}
 		}
 
diff --git a/js/public/app.js b/js/public/app.js
index 3643696..4b7f287 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -204,9 +204,8 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
 					var bufferedContacts = [];
 
 					$.each(jsondata['phonelist'], function(id, val) {
-						var fn, peerLabel, idxVal, idxVal2;
-						idxVal = id.replace(/\//g,' ');
-						idxVal2 = idxVal.replace('/ /g','');
+						var fn, peerLabel, idxVal;
+						idxVal = id.replace(/\//g,'');
 						if (typeof jsondata['contacts'][id] == 'undefined') {
 							peerLabel = idxVal;
 						}
@@ -218,7 +217,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
 						if (!inArray(peerLabel, bufferedContacts)) {
 							var contactObj = {
 								'label': peerLabel,
-								'nav': idxVal2,
+								'nav': idxVal,
 								'unread': val
 							};