diff --git a/public_html/modules/project/tickets/view.php b/public_html/modules/project/tickets/view.php
index 7827e45..4f7e4a6 100644
--- a/public_html/modules/project/tickets/view.php
+++ b/public_html/modules/project/tickets/view.php
@@ -45,7 +45,7 @@ try
 				"user"		=> $sMessage->sAuthor->sDisplayName,
 				"component"	=> $sMessage->sComponent,
 				"operation"	=> $sMessage->sOperation,
-				"date"		=> local_from_unix($sMessage->sDate, $locale->datetime_short)
+				"date"		=> time_ago($sMessage->sDate, $locale)
 			);
 		}
 		else
@@ -54,7 +54,7 @@ try
 				"event"		=> false,
 				"author"	=> $sMessage->sAuthor->sDisplayName,
 				"body"		=> $sMessage->sBody,
-				"date"		=> local_from_unix($sMessage->sDate, $locale->datetime_short)
+				"date"		=> time_ago($sMessage->sDate, $locale)
 			);
 		}
 	}
@@ -65,7 +65,7 @@ try
 		"status"	=> $sTicket->sStatusName,
 		"owner"		=> $sTicket->sOwner->sDisplayName,
 		"creator"	=> $sTicket->sCreator->sDisplayName,
-		"date"		=> local_from_unix($sTicket->sCreationDate, $locale->datetime_short),
+		"date"		=> local_from_unix($sTicket->sCreationDate, $locale->datetime_long),
 		"body"		=> $sInitialMessage->sBody,
 		"updates"	=> $sUpdates
 	));
diff --git a/public_html/templates/project/tickets/view.tpl b/public_html/templates/project/tickets/view.tpl
index 7024fce..f0c6f21 100644
--- a/public_html/templates/project/tickets/view.tpl
+++ b/public_html/templates/project/tickets/view.tpl
@@ -3,26 +3,26 @@
 	<div class="metadata">
 		<div class="currentdata">
 			<div class="priority">
-				<span class="key">Priority</span>
+				<span class="key">Priority:</span>
 				<span class="value">{%?priority}</span>
 			</div>
 			<div class="status">
-				<span class="key">Status</span>
+				<span class="key">Status:</span>
 				<span class="value">{%?status}</span>
 			</div>
 			<div class="owner">
-				<span class="key">Owner</span>
+				<span class="key">Owner:</span>
 				<span class="value">{%?owner}</span>
 			</div>
 		</div>
 		<div class="originaldata">
 			<div class="creator">
-				<span class="key">Creator</span>
+				<span class="key">Creator:</span>
 				<span class="value">{%?creator}</span>
 			</div>
 			<div class="date">
-				<span class="key">Date</span>
-				<span class="value">2013/01/17 11:02:27</span>
+				<span class="key">Date:</span>
+				<span class="value">{%?date}</span>
 			</div>
 		</div>
 		<div class="clear"></div>