diff --git a/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java b/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
index 6517e181746c43e7f0a1669c43b1768b37be5509..40ccb3af1a318d7681d21ad8cc4f635ea0aafe22 100644
--- a/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
+++ b/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
@@ -1179,6 +1179,7 @@ DatabaseCleaner.Callback {
 	 */
 	private boolean storeMessage(T txn, ContactId c, Message m)
 			throws DbException {
+		if(m.getTimestamp() > clock.currentTimeMillis()) return false;
 		GroupId g = m.getGroup();
 		if(g == null) return storePrivateMessage(txn, m, c, true);
 		if(!db.containsVisibleSubscription(txn, c, g)) return false;