diff --git a/k9mail/src/main/java/com/fsck/k9/autocrypt/AutocryptHeader.java b/k9mail/src/main/java/com/fsck/k9/autocrypt/AutocryptHeader.java
index cdcb7b2ed..88706e18d 100644
--- a/k9mail/src/main/java/com/fsck/k9/autocrypt/AutocryptHeader.java
+++ b/k9mail/src/main/java/com/fsck/k9/autocrypt/AutocryptHeader.java
@@ -12,7 +12,7 @@ import okio.ByteString;
 class AutocryptHeader {
     static final String AUTOCRYPT_HEADER = "Autocrypt";
 
-    static final String AUTOCRYPT_PARAM_TO = "addr";
+    static final String AUTOCRYPT_PARAM_ADDR = "addr";
     static final String AUTOCRYPT_PARAM_KEY_DATA = "keydata";
 
     static final String AUTOCRYPT_PARAM_TYPE = "type";
@@ -46,7 +46,7 @@ class AutocryptHeader {
         }
 
         String autocryptHeaderString = AutocryptHeader.AUTOCRYPT_HEADER + ": ";
-        autocryptHeaderString += AutocryptHeader.AUTOCRYPT_PARAM_TO + "=" + addr + ";";
+        autocryptHeaderString += AutocryptHeader.AUTOCRYPT_PARAM_ADDR + "=" + addr + ";";
         if (isPreferEncryptMutual) {
             autocryptHeaderString += AutocryptHeader.AUTOCRYPT_PARAM_PREFER_ENCRYPT + "=" +
                     AutocryptHeader.AUTOCRYPT_PREFER_ENCRYPT_MUTUAL + ";";
diff --git a/k9mail/src/main/java/com/fsck/k9/autocrypt/AutocryptHeaderParser.java b/k9mail/src/main/java/com/fsck/k9/autocrypt/AutocryptHeaderParser.java
index 04b4c922d..686924478 100644
--- a/k9mail/src/main/java/com/fsck/k9/autocrypt/AutocryptHeaderParser.java
+++ b/k9mail/src/main/java/com/fsck/k9/autocrypt/AutocryptHeaderParser.java
@@ -57,7 +57,7 @@ class AutocryptHeaderParser {
             return null;
         }
 
-        String to = parameters.remove(AutocryptHeader.AUTOCRYPT_PARAM_TO);
+        String to = parameters.remove(AutocryptHeader.AUTOCRYPT_PARAM_ADDR);
         if (to == null) {
             Timber.e("autocrypt: no to header!");
             return null;