diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 790e5a18a..70cd53bb1 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -1026,8 +1026,10 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         message.setRecipients(RecipientType.CC, getAddresses(mCcView));
         message.setRecipients(RecipientType.BCC, getAddresses(mBccView));
         message.setSubject(mSubjectView.getText().toString());
-        if (mReadReceipt == true) {
+        if (mReadReceipt) {
             message.setHeader("Disposition-Notification-To", from.toEncodedString());
+            message.setHeader("X-Confirm-Reading-To", from.toEncodedString());
+            message.setHeader("Return-Receipt-To", from.toEncodedString());
         }
         message.setHeader("User-Agent", getString(R.string.message_header_mua));