--- /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js.org	Sun Nov  7 12:33:49 2010
+++ /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js	Sun Nov  7 20:38:08 2010
@@ -1980,6 +1980,9 @@
 		var needToInstantiateButtons = false;
 		var today = Date.now();
 		var d = new Date();
+		var today_year  = d.getFullYear();
+		var today_month = d.getMonth();
+		var today_date  = d.getDate();
 		var prevAddress = "";
 		for (var i = 0; i < stuff.length; i++) {
 			var delayed = {};
@@ -2016,8 +2019,23 @@
 				prevAddress = MessagingUtils.formatPhoneNumber(remoteAddr);
 				msg.dividerAddress = prevAddress; // this used to use msg.timeStamp - changed 2008-11-05	
 			}
-			msg.niceDate = BucketDateFormatter.getDateBucket(d, true, true);
-
+			
+			msg.time = Mojo.Format.formatDate(d, {'time': 'short'});
+			
+			var d_year  = d.getFullYear();
+			var d_month = d.getMonth();
+			var d_date  = d.getDate();
+			
+			if (d_year != today_year) {
+				msg.date = d_date + "/" + d_month + "/" + d_year;
+			} else if (d_month != today_month || Math.abs(d_date - today_date) > 7) {
+				msg.date = d_date + " " + Mojo.Locale.getMonthNames()[d_month];
+			} else if (d_date != today_date) {
+				msg.date = Mojo.Locale.getDayNames()[d_date];
+			} else {
+				msg.date = $L("Today");
+			}
+			
 			// divider hack - round to the nearest 5 minutes
 			// we have to do this because the list divider implementation does not allow a divider
 			// to have knowledge about other dividers
@@ -2028,11 +2046,7 @@
 			if (prevAddress) {
 				this.dividerAddress = prevAddress;
 			}
-			if (msg.locked !== true) {
-				msg.dividerLabel = msg.transportClass + BucketDateFormatter.getDateBucket(d, true, true) + this.dividerAddress;
-			}else if(i>1){
-				msg.dividerLabel = stuff[i-1].dividerLabel; 
-			}
+			msg.dividerLabel = msg.transportClass + d + this.dividerAddress;
 			
 			// HACK: Always display the message sent time for GCF
 			// When this is fixed, it should use 'timestamp' instead of 'localTimestamp'