diff --git a/src/main/java/de/fabianonline/telegram_backup/Database.java b/src/main/java/de/fabianonline/telegram_backup/Database.java
index 5461e54..3341e52 100644
--- a/src/main/java/de/fabianonline/telegram_backup/Database.java
+++ b/src/main/java/de/fabianonline/telegram_backup/Database.java
@@ -439,7 +439,7 @@ class Database {
 	
 	private void getMessagesForExport(String type, Integer id, ChatMessageProcessor p) {
 		try {
-			ResultSet rs = stmt.executeQuery("SELECT messages.id, text, time, has_media, " +
+			ResultSet rs = stmt.executeQuery("SELECT messages.id, text, time*1000, has_media, " +
 				"sticker, first_name, last_name, username FROM messages, users WHERE " +
 				"users.id=messages.from_id AND dialog_id=" + id + " AND from_type='" + type + "' " +
 				"ORDER BY messages.id");
diff --git a/src/main/java/de/fabianonline/telegram_backup/HTMLExporter.java b/src/main/java/de/fabianonline/telegram_backup/HTMLExporter.java
index ac97fc6..a4876dc 100644
--- a/src/main/java/de/fabianonline/telegram_backup/HTMLExporter.java
+++ b/src/main/java/de/fabianonline/telegram_backup/HTMLExporter.java
@@ -68,7 +68,7 @@ class HTMLExporter {
 		}
 		
 		public void process(Database.Message msg) {
-			w.println("" + msg.text + "<br>");
+			w.println("" + String.format("%1$tF %1$tT", msg.time) + " - " + msg.text + "<br>");
 		}
 	}