diff --git a/WebApplication/AllPages.aspx.cs b/WebApplication/AllPages.aspx.cs
index 10df4a7..664d807 100644
--- a/WebApplication/AllPages.aspx.cs
+++ b/WebApplication/AllPages.aspx.cs
@@ -180,7 +180,7 @@ namespace ScrewTurn.Wiki {
 			sb.Append(@""" title=""");
 			sb.Append(Properties.Messages.SortByDate);
 			sb.Append(@""">");
-			sb.Append(Properties.Messages.CreatedOn.Replace(" ", " "));
+			sb.Append(Properties.Messages.CreatedOn);
 			sb.Append((reverse && sortBy.Equals("creation") ? " ↑" : ""));
 			sb.Append((!reverse && sortBy.Equals("creation") ? " ↓" : ""));
 			sb.Append("</a></th>");
@@ -195,7 +195,7 @@ namespace ScrewTurn.Wiki {
 			sb.Append(@""" title=""");
 			sb.Append(Properties.Messages.SortByDate);
 			sb.Append(@""">");
-			sb.Append(Properties.Messages.ModifiedOn.Replace(" ", "&nbsp;"));
+			sb.Append(Properties.Messages.ModifiedOn);
 			sb.Append((reverse && sortBy.Equals("date") ? " &uarr;" : ""));
 			sb.Append((!reverse && sortBy.Equals("date") ? " &darr;" : ""));
 			sb.Append("</a></th>");
@@ -210,7 +210,7 @@ namespace ScrewTurn.Wiki {
 			sb.Append(@""" title=""");
 			sb.Append(Properties.Messages.SortByUser);
 			sb.Append(@""">");
-			sb.Append(Properties.Messages.CreatedBy.Replace(" ", "&nbsp;"));
+			sb.Append(Properties.Messages.CreatedBy);
 			sb.Append((reverse && sortBy.Equals("creator") ? " &uarr;" : ""));
 			sb.Append((!reverse && sortBy.Equals("creator") ? " &darr;" : ""));
 			sb.Append("</a></th>");
@@ -225,7 +225,7 @@ namespace ScrewTurn.Wiki {
 			sb.Append(@""" title=""");
 			sb.Append(Properties.Messages.SortByUser);
 			sb.Append(@""">");
-			sb.Append(Properties.Messages.ModifiedBy.Replace(" ", "&nbsp;"));
+			sb.Append(Properties.Messages.ModifiedBy);
 			sb.Append((reverse && sortBy.Equals("user") ? " &uarr;" : ""));
 			sb.Append((!reverse && sortBy.Equals("user") ? " &darr;" : ""));
 			sb.Append("</a></th>");
@@ -292,12 +292,12 @@ namespace ScrewTurn.Wiki {
 
 					// Creation date/time
 					sb.Append(@"<td>");
-					sb.Append(Preferences.AlignWithTimezone(pageList[i].CreationDateTime).ToString(Settings.DateTimeFormat).Replace(" ", "&nbsp;") + "&nbsp;");
+					sb.Append(Preferences.AlignWithTimezone(pageList[i].CreationDateTime).ToString(Settings.DateTimeFormat) + "&nbsp;");
 					sb.Append("</td>");
 
 					// Mod. date/time
 					sb.Append(@"<td>");
-					sb.Append(Preferences.AlignWithTimezone(pageList[i].ModificationDateTime).ToString(Settings.DateTimeFormat).Replace(" ", "&nbsp;") + "&nbsp;");
+					sb.Append(Preferences.AlignWithTimezone(pageList[i].ModificationDateTime).ToString(Settings.DateTimeFormat) + "&nbsp;");
 					sb.Append("</td>");
 
 					// Creator
diff --git a/WebApplication/Themes/Default-v2/Screen_Styles.css b/WebApplication/Themes/Default-v2/Screen_Styles.css
index fb119df..74bfefc 100644
--- a/WebApplication/Themes/Default-v2/Screen_Styles.css
+++ b/WebApplication/Themes/Default-v2/Screen_Styles.css
@@ -248,6 +248,7 @@ tr.tableheader td, th {
 	margin: 0px;
 	padding: 2px 5px 2px 5px;
 	border-bottom: solid 1px #999999;
+	white-space: nowrap;
 }
 
 tr.tablerow td {
diff --git a/WebApplication/Themes/Default/Screen_Styles.css b/WebApplication/Themes/Default/Screen_Styles.css
index aa072d2..3ffbc3d 100644
--- a/WebApplication/Themes/Default/Screen_Styles.css
+++ b/WebApplication/Themes/Default/Screen_Styles.css
@@ -270,6 +270,7 @@ tr.tableheader td, th {
 	margin: 0px;
 	padding: 2px 5px 2px 5px;
 	border-bottom: solid 1px #DDDDDD;
+	white-space: nowrap;
 }
 
 tr.tablerow td {
diff --git a/WebApplication/Themes/Elegant/Screen_Styles.css b/WebApplication/Themes/Elegant/Screen_Styles.css
index 34e56f2..e1a559a 100644
--- a/WebApplication/Themes/Elegant/Screen_Styles.css
+++ b/WebApplication/Themes/Elegant/Screen_Styles.css
@@ -250,6 +250,7 @@ tr.tableheader td, th {
 	margin: 0px;
 	padding: 2px 5px 2px 5px;
 	border-bottom: solid 1px #999999;
+	white-space: nowrap;
 }
 
 tr.tablerow td {