diff --git a/controller/smscontroller.php b/controller/smscontroller.php
index 8dcee38..1f272b0 100644
--- a/controller/smscontroller.php
+++ b/controller/smscontroller.php
@@ -162,7 +162,7 @@ class SmsController extends Controller {
 		// Cache country because of loops
 		$configuredCountry = $this->configMapper->getCountry();
 
-		$fmtPN = PhoneNumberFormatter::format($configuredCountry, $phoneNumber);
+		$fmtPN = PhoneNumberFormatter::format($configuredCountry, $contact);
 		if (isset($contacts[$fmtPN])) {
 			$contactName = $contacts[$fmtPN];
 		}
@@ -175,7 +175,7 @@ class SmsController extends Controller {
 			}
 		}
 		else {
-			$this->smsMapper->removeMessagesForPhoneNumber($this->userId, $phoneNumber);
+			$this->smsMapper->removeMessagesForPhoneNumber($this->userId, $contact);
 		}
 		return new JSONResponse(array());
 	}
diff --git a/db/smsmapper.php b/db/smsmapper.php
index 9fe422e..f41c1de 100644
--- a/db/smsmapper.php
+++ b/db/smsmapper.php
@@ -174,6 +174,11 @@ class SmsMapper extends Mapper {
 	}
 
 	public function removeMessagesForPhoneNumber ($userId, $phoneNumber) {
+		\OCP\DB::beginTransaction();
+		$query = \OCP\DB::prepare('DELETE FROM ' .
+		'*PREFIX*ocsms_smsdatas WHERE user_id = ? AND sms_address = ?');
+		$query->execute(array($userId, $phoneNumber));
+		\OCP\DB::commit();
 	}
 
 	public function getLastMessageTimestampForAllPhonesNumbers ($userId, $order = true) {