diff --git a/backend.php b/backend.php
index 63b38e3ab..f7c26df41 100644
--- a/backend.php
+++ b/backend.php
@@ -577,6 +577,7 @@
 		$addheader = $_GET["addheader"];
 
 		$result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id,
+			SUBSTRING(updated,1,16) as updated,
 			(SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url
 			FROM ttrss_entries,ttrss_user_entries
 			WHERE	id = '$id' AND ref_id = id");
@@ -625,7 +626,14 @@
 
 			print "<div class=\"postHeader\"><table width=\"100%\">";
 
-			print "<tr><td colspan='2'>" . $line["title"] . "</td></tr>";
+			print "<tr><td>" . $line["title"] . "</td>";
+
+			$parsed_updated = date(get_pref($link, 'LONG_DATE_FORMAT'), 
+				strtotime($line["updated"]));
+		
+			print "<td class=\"postDate\">$parsed_updated</td>";
+						
+			print "</tr>";
 
 			$tmp_result = db_query($link, "SELECT DISTINCT tag_name FROM
 				ttrss_tags WHERE post_int_id = " . $line["int_id"] . "
@@ -1088,7 +1096,8 @@
 				print "</td>";
 			}
 
-			$updated_fmt = date("M d, G:i", strtotime($line["updated"]));
+			$updated_fmt = date(get_pref($link, 'SHORT_DATE_FORMAT'), 
+				strtotime($line["updated"]));
 			print "<td class=\"hlUpdated\"><nobr>$updated_fmt</nobr></td>";
 
 			print "</tr>";
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index dbd43b5e7..9204b6573 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -182,6 +182,9 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('SHOW_CONTENT_PREVIEW', 1, 'true', 'Show content preview in headlines list',2);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('SHORT_DATE_FORMAT', 2, 'M d, G:i', 'Short date format',3);
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('LONG_DATE_FORMAT', 2, 'D, M d Y - G:i', 'Long date format',3);
+
 create table ttrss_user_prefs (
 	owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
 	pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,
diff --git a/tt-rss.css b/tt-rss.css
index 59ff1aea3..67970aff5 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -759,3 +759,9 @@ tr.evenUnreadSelected td.headlineContent {
 	height : 1em;
 	background-color : #e0e0ff;
 } */
+
+div.postHeader td.postDate {
+	font-size : x-small;
+	text-align : right;
+	color : gray;
+}