diff --git a/appinfo/application.php b/appinfo/ocsmsapp.php
similarity index 94%
rename from appinfo/application.php
rename to appinfo/ocsmsapp.php
index d1451c7..7d9463d 100644
--- a/appinfo/application.php
+++ b/appinfo/ocsmsapp.php
@@ -20,7 +20,7 @@ use \OCA\OcSms\Db\Sms;
 use \OCA\OcSms\Db\SmsMapper;
 
 
-class Application extends App {
+class OcSmsApp extends App {
 
 	/**
 	* @var array used to cache the parsed contacts for every request
@@ -88,6 +88,8 @@ class Application extends App {
 			foreach ($result as $r) {
 				if (isset ($r["TEL"])) {
 					self::$contacts[$r["TEL"]] = $r["FN"];
+					$phoneId = preg_replace("#[ ]#", "", $r["TEL"]);
+					self::$contacts[$phoneId] = $r["FN"];
 				}
 			}
 		}
diff --git a/controller/smscontroller.php b/controller/smscontroller.php
index 2f587b8..06eda39 100644
--- a/controller/smscontroller.php
+++ b/controller/smscontroller.php
@@ -25,7 +25,7 @@ class SmsController extends Controller {
 	private $smsMapper;
 	private $errorMsg;
 
-	public function __construct ($appName, IRequest $request, $userId, SmsMapper $mapper, Application $app){
+	public function __construct ($appName, IRequest $request, $userId, SmsMapper $mapper, OcSmsApp $app){
 		parent::__construct($appName, $request);
 		$this->app = $app;
 		$this->userId = $userId;