diff --git a/controller/smscontroller.php b/controller/smscontroller.php
index a1b260c..29fe031 100644
--- a/controller/smscontroller.php
+++ b/controller/smscontroller.php
@@ -214,7 +214,14 @@ class SmsController extends Controller {
 				$fmtPN2 = preg_replace("#\/#","", $fmtPN);
 				$contacts[$fmtPN] = $contactsSrc[$fmtPN];
 				$contacts[$fmtPN2] = $contactsSrc[$fmtPN];
-				$photos[$fmtPN] = $photosSrc[$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/db/configmapper.php b/db/configmapper.php
index 3a7ddbc..9437932 100644
--- a/db/configmapper.php
+++ b/db/configmapper.php
@@ -12,10 +12,11 @@
 
 namespace OCA\OcSms\Db;
 
-use OCP\AppFramework\Db\DoesNotExistException;
-use \OCP\AppFramework\Db\Mapper;
 use \OCP\IDb;
 
+use \OCP\AppFramework\Db\Mapper;
+use \OCP\AppFramework\Db\DoesNotExistException;
+
 class ConfigMapper extends Mapper {
 
 	/**
diff --git a/db/smsmapper.php b/db/smsmapper.php
index 7ee6e27..94288f4 100644
--- a/db/smsmapper.php
+++ b/db/smsmapper.php
@@ -14,6 +14,7 @@ namespace OCA\OcSms\Db;
 use \OCP\IDb;
 
 use \OCP\AppFramework\Db\Mapper;
+
 use \OCA\OcSms\AppInfo\OcSmsApp;
 use \OCA\OcSms\Lib\PhoneNumberFormatter;