diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java b/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
index ef7252eeda94f8d810a8ee1dc48f887713408fa8..6ac5fb32faa39b16c652a1bec7b85b46c188d791 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
@@ -208,8 +208,10 @@ implements DatabaseListener, OnClickListener, OnItemClickListener {
 		runOnUiThread(new Runnable() {
 			public void run() {
 				if(messageIds.add(m.getId())) {
-					adapter.add(new PrivateMessageHeader(m, !incoming, false,
-							contactId, incoming));
+					adapter.add(new PrivateMessageHeader(m.getId(),
+							m.getParent(), m.getContentType(), m.getSubject(),
+							m.getTimestamp(), !incoming, false, contactId,
+							incoming));
 					adapter.sort(AscendingHeaderComparator.INSTANCE);
 					selectFirstUnread();
 				}
diff --git a/briar-api/src/net/sf/briar/api/db/GroupMessageHeader.java b/briar-api/src/net/sf/briar/api/db/GroupMessageHeader.java
index a0d796a7483b4c9c60a653bd8b53041cd2b9d9c6..a994de1bd4d6abf190c5ca18d253a19f8273a240 100644
--- a/briar-api/src/net/sf/briar/api/db/GroupMessageHeader.java
+++ b/briar-api/src/net/sf/briar/api/db/GroupMessageHeader.java
@@ -3,7 +3,6 @@ package net.sf.briar.api.db;
 import net.sf.briar.api.Rating;
 import net.sf.briar.api.messaging.Author;
 import net.sf.briar.api.messaging.GroupId;
-import net.sf.briar.api.messaging.Message;
 import net.sf.briar.api.messaging.MessageId;
 
 public class GroupMessageHeader extends MessageHeader {
@@ -21,13 +20,6 @@ public class GroupMessageHeader extends MessageHeader {
 		this.rating = rating;
 	}
 
-	public GroupMessageHeader(Message m, boolean read, boolean starred,
-			Rating rating) {
-		this(m.getId(), m.getParent(), m.getContentType(), m.getSubject(),
-				m.getTimestamp(), read, starred, m.getGroup().getId(),
-				m.getAuthor(), rating);
-	}
-
 	/** Returns the ID of the group to which the message belongs. */
 	public GroupId getGroupId() {
 		return groupId;
diff --git a/briar-api/src/net/sf/briar/api/db/PrivateMessageHeader.java b/briar-api/src/net/sf/briar/api/db/PrivateMessageHeader.java
index 0add5ab62ae1f48162e2c88f8574a6feab978f58..af55211c66fb691f233ce82816525d03fca2ff29 100644
--- a/briar-api/src/net/sf/briar/api/db/PrivateMessageHeader.java
+++ b/briar-api/src/net/sf/briar/api/db/PrivateMessageHeader.java
@@ -1,7 +1,6 @@
 package net.sf.briar.api.db;
 
 import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.Message;
 import net.sf.briar.api.messaging.MessageId;
 
 public class PrivateMessageHeader extends MessageHeader {
@@ -17,12 +16,6 @@ public class PrivateMessageHeader extends MessageHeader {
 		this.incoming = incoming;
 	}
 
-	public PrivateMessageHeader(Message m, boolean read, boolean starred,
-			ContactId contactId, boolean incoming) {
-		this(m.getId(), m.getParent(), m.getContentType(), m.getSubject(),
-				m.getTimestamp(), read, starred, contactId, incoming);
-	}
-
 	/**
 	 * Returns the ID of the contact who is the sender (if incoming) or
 	 * recipient (if outgoing) of this message.