--- /usr/palm/applications/com.palm.app.phone/app/controllers/incomingcall-assistant.js_bak	Thu Jul  9 10:57:13 2009
+++ /usr/palm/applications/com.palm.app.phone/app/controllers/incomingcall-assistant.js	Thu Jul  9 10:57:31 2009
@@ -152,7 +152,7 @@
 		} else if (contact.cnapName && contact.cnapName !== "unknown") {
 			name = contact.cnapName;
 		} else {
-			name = Messages.unknownCaller;
+			name = RegionLookup.regionFromPhoneNumber(number);
 		}
 
 		this.fromContacts = fromContacts;
--- /usr/palm/applications/com.palm.app.phone/app/controllers/calllog-assistant.js_bak	Thu Jul  9 10:57:13 2009
+++ /usr/palm/applications/com.palm.app.phone/app/controllers/calllog-assistant.js	Thu Jul  9 10:57:39 2009
@@ -426,7 +426,7 @@
 		
 		// format phone number label
 		if (entry.label == -1) {
-			entry.label = '';
+			entry.label = RegionLookup.regionFromPhoneNumber(entry.number);
 		} else {
 			var newLabel = Messages.phoneLabel[entry.label];
 			if(newLabel) {
--- /usr/palm/applications/com.palm.app.phone/app/controllers/announcer-assistant.js_bak	Thu Jul  9 10:57:13 2009
+++ /usr/palm/applications/com.palm.app.phone/app/controllers/announcer-assistant.js	Thu Jul  9 10:57:58 2009
@@ -241,6 +241,8 @@
 		call.displayName = this.getDisplayNameFromContact(contact);
 		if (!(call.displayName)) {
 			call.displayName = FormatPhoneNumber(number);
+                        var message = Messages.contactWithLabel;
+                        call.displayName = new Template(message).evaluate({"contact":call.displayName, "label":RegionLookup.regionFromPhoneNumber(number)});
 		} else if (contact.labelFormatted) {
 			var message = Messages.contactWithLabel;
 			call.displayName = new Template(message).evaluate({"contact":call.displayName, "label":contact.labelFormatted});	
--- /usr/palm/applications/com.palm.app.phone/app/controllers/missedcall-assistant.js_bak	Thu Jul  9 10:57:13 2009
+++ /usr/palm/applications/com.palm.app.phone/app/controllers/missedcall-assistant.js	Thu Jul  9 10:58:08 2009
@@ -52,7 +52,7 @@
 		this.pictureLoc = this.formatPicture();
 	
 		// ensure empty label is displayed as empty
-		this.displayLabel = (this.contact.labelFormatted ? this.contact.labelFormatted  : "");
+		this.displayLabel = (this.contact.labelFormatted ? this.contact.labelFormatted  : RegionLookup.regionFromPhoneNumber(number));
 		this.message = message +Mojo.Format.formatDate(new Date(parseInt(timeStamp)), {time:'short'});
 		QDLogger.log( "MissedcallAssistant::updateFields", "end");
 	},
--- /usr/palm/applications/com.palm.app.phone/app/models/FormattedCall.js_bak	Thu Jul  9 10:57:13 2009
+++ /usr/palm/applications/com.palm.app.phone/app/models/FormattedCall.js	Thu Jul  9 10:58:16 2009
@@ -48,7 +48,7 @@
 		this.id = callMsg[lineNumber].id;
 		
 		// ensure empty label is displayed as empty
-		this.displayLabel = (callMsg[lineNumber].contact.labelFormatted ? callMsg[lineNumber].contact.labelFormatted : "");
+		this.displayLabel = (callMsg[lineNumber].contact.labelFormatted ? callMsg[lineNumber].contact.labelFormatted : RegionLookup.regionFromPhoneNumber(callMsg[lineNumber].number));
     },
     
 	// given a phone number (or empty/unknown value), return the formatted and