diff -ru adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
--- adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html	2010-08-18 17:46:23.518008000 +0200
+++ adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html	2010-08-18 17:46:50.166703000 +0200
@@ -12,7 +12,7 @@
 						</tr>
 						<tr>
 							<td class="message">
-							<div class="timeStamp nameStamp">%sender%  <span class="timeStamp">%time{%x %X}%</span></div>
+							<div class="timeStamp nameStamp">%sender%  <span class="timeStamp">%time%</span></div>
 								%message%
 								<span id="insert"></span>
 							</td>
diff -ru adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html
--- adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html	2010-08-18 17:46:23.520435000 +0200
+++ adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html	2010-08-18 17:46:55.162600000 +0200
@@ -12,7 +12,7 @@
 						</tr>
 						<tr>
 							<td class="message">
-							<div class="timeStamp nameStamp">%sender%  <span class="timeStamp">%time{%x %X}%</span>
+							<div class="timeStamp nameStamp">%sender%  <span class="timeStamp">%time%</span>
 							</div>
 								%message%
 								<span id="insert"></span>
diff -ru adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
--- adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html	2010-08-18 17:46:23.522892000 +0200
+++ adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html	2010-08-18 17:46:59.873026000 +0200
@@ -3,7 +3,7 @@
 	<div>
 		
 		%message%
-		<div class="timeStamp">%time{%x %X}%</div>
+		<div class="timeStamp">%time%</div>
 	</div>
 	<span id="insert"></span>
 </div>
diff -ru adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html
--- adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html	2010-08-18 17:46:23.525205000 +0200
+++ adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html	2010-08-18 17:47:04.643785000 +0200
@@ -2,6 +2,6 @@
 			<div>
 				
 				%message%
-				<div class="timeStamp">%time{%x %X}%</div>
+				<div class="timeStamp">%time%</div>
 			</div><span id="insert"></span>
 
diff -ru adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html
--- adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html	2010-08-18 17:46:23.540007000 +0200
+++ adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html	2010-08-18 17:47:09.532135000 +0200
@@ -12,7 +12,7 @@
 						</tr>
 						<tr>
 							<td class="message">
-							<div class="timeStamp nameStamp">%sender%  <span class="timeStamp">%time{%x %X}%</span></div>
+							<div class="timeStamp nameStamp">%sender%  <span class="timeStamp">%time%</span></div>
 								%message%
 								<span id="insert"></span>
 							</td>
diff -ru adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html
--- adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html	2010-08-18 17:46:23.542328000 +0200
+++ adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html	2010-08-18 17:47:14.703932000 +0200
@@ -12,7 +12,7 @@
 						</tr>
 						<tr>
 							<td class="message">
-							<div class="timeStamp nameStamp">%sender%  <span class="timeStamp">%time{%x %X}%</span> <span class="historyIcon"><img src="history.png"/></span>
+							<div class="timeStamp nameStamp">%sender%  <span class="timeStamp">%time%</span> <span class="historyIcon"><img src="history.png"/></span>
 							</div>
 								%message%
 								<span id="insert"></span>
diff -ru adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html
--- adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html	2010-08-18 17:46:23.544546000 +0200
+++ adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html	2010-08-18 17:47:19.276145000 +0200
@@ -2,7 +2,7 @@
 	<div class="followUp"></div>
 	<div>
 		%message%
-		<div class="timeStamp">%time{%x %X}%</div>
+		<div class="timeStamp">%time%</div>
 	</div>
 	<span id="insert"></span>
 </div>
diff -ru adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html
--- adium-theme-ubuntu-0.3.old//ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html	2010-08-18 17:46:23.547538000 +0200
+++ adium-theme-ubuntu-0.3/ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html	2010-08-18 17:47:24.496618000 +0200
@@ -1,6 +1,6 @@
 <div class="followUp"></div>
 <div>
 	%message%
-	<div class="timeStamp">%time{%x %X}%</div>
+	<div class="timeStamp">%time%</div>
 </div><span id="insert"></span>