diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/protocol/MailboxMessage.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/protocol/MailboxMessage.java
index cf497c249297b2196b7a5fc88b4d2496bc9bec84..3d02636d72508e1e8cba7e54db9e21b607ba7701 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/protocol/MailboxMessage.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/protocol/MailboxMessage.java
@@ -50,8 +50,7 @@ public interface MailboxMessage {
 	 * match responses to a request.
 	 * <p>
 	 * (NOTE: This identifier is only unique for "active" requests, which
-	 * wer sent and await a response. Replay protection must be provided by the
-	 * underlying protocol!)
+	 * have benn sent and await a response)
 	 */
 	long getId();
 
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/protocol/MailboxProtocol.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/protocol/MailboxProtocol.java
index 3542593c34c5ab1fd3e3f0c3485007a6d35529db..c72d12c0f1b2c946c7a524af4e3e4a2f7faf91b1 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/protocol/MailboxProtocol.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/protocol/MailboxProtocol.java
@@ -67,7 +67,7 @@ public class MailboxProtocol implements Runnable {
 	public void writeRequest(MailboxRequest req)
 			throws InterruptedException, IOException {
 		if (req.hasResponse())
-			pendingRequests.put(req.getId(), (MailboxRequest) req);
+			pendingRequests.put(req.getId(), req);
 		writeMailboxMessage(req);
 
 	}