diff --git a/controller/smscontroller.php b/controller/smscontroller.php
index e03456b..5b3acdc 100644
--- a/controller/smscontroller.php
+++ b/controller/smscontroller.php
@@ -145,7 +145,7 @@ class SmsController extends Controller {
 		// Contact resolved
 		if ($contactName != "" && isset($iContacts[$contactName])) {
 			// forall numbers in iContacts
-			foreach($iContacts[$contactName] as $cnumber) {
+			foreach ($iContacts[$contactName] as $cnumber) {
 				$messages = $messages +	$this->smsMapper->getAllMessagesForPhoneNumber($this->userId, $cnumber, $configuredCountry, $lastDate);
 				$msgCount += $this->smsMapper->countMessagesForPhoneNumber($this->userId, $cnumber, $configuredCountry);
 				$phoneNumbers[] = PhoneNumberFormatter::format($configuredCountry, $cnumber);
@@ -197,12 +197,18 @@ class SmsController extends Controller {
 		// Contact resolved
 		if ($contactName != "" && isset($iContacts[$contactName])) {
 			// forall numbers in iContacts
-			foreach($iContacts[$contactName] as $cnumber) {
+			foreach ($iContacts[$contactName] as $cnumber) {
 				$this->smsMapper->removeMessagesForPhoneNumber($this->userId, $cnumber);
 			}
 		}
 		else {
-			$this->smsMapper->removeMessagesForPhoneNumber($this->userId, $contact);
+			// If we didn't match a contact we need to lookup the raw sms phone numbers associated with the formatted phone number that was passed in as $contact.
+			$phlist = $this->smsMapper->getAllPhoneNumbersForFPN($this->userId, $contact, $configuredCountry);
+
+			// Loop through the returned list of phone numbers and delete them.
+			foreach ($phlist as $phnumber => $value) {
+				$this->smsMapper->removeMessagesForPhoneNumber($this->userId, $phnumber);
+			}
 		}
 		return new JSONResponse(array());
 	}