diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ConsolidateOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ConsolidateOperation.java
index 7c04e3442..da0d34b87 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ConsolidateOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ConsolidateOperation.java
@@ -39,7 +39,7 @@ public class ConsolidateOperation extends BaseReadWriteOperation<ConsolidateInpu
     @Override
     public ConsolidateResult execute(ConsolidateInputParcel consolidateInputParcel,
                                      CryptoInputParcel cryptoInputParcel) {
-        if (consolidateInputParcel.mConsolidateRecovery) {
+        if (consolidateInputParcel.isStartFromRecovery()) {
             return mKeyWritableRepository.consolidateDatabaseStep2(mProgressable);
         } else {
             return mKeyWritableRepository.consolidateDatabaseStep1(mProgressable);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ConsolidateInputParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ConsolidateInputParcel.java
index 15d109814..1973e5dbe 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ConsolidateInputParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ConsolidateInputParcel.java
@@ -19,40 +19,17 @@
 
 package org.sufficientlysecure.keychain.service;
 
-import android.os.Parcel;
+
 import android.os.Parcelable;
 
-public class ConsolidateInputParcel implements Parcelable {
+import com.google.auto.value.AutoValue;
 
-    public boolean mConsolidateRecovery;
 
-    public ConsolidateInputParcel(boolean consolidateRecovery) {
-        mConsolidateRecovery = consolidateRecovery;
+@AutoValue
+public abstract class ConsolidateInputParcel implements Parcelable {
+    public abstract boolean isStartFromRecovery();
+
+    public static ConsolidateInputParcel createConsolidateInputParcel(boolean consolidateRecovery) {
+        return new AutoValue_ConsolidateInputParcel(consolidateRecovery);
     }
-
-    protected ConsolidateInputParcel(Parcel in) {
-        mConsolidateRecovery = in.readByte() != 0x00;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeByte((byte) (mConsolidateRecovery ? 0x01 : 0x00));
-    }
-
-    public static final Parcelable.Creator<ConsolidateInputParcel> CREATOR = new Parcelable.Creator<ConsolidateInputParcel>() {
-        @Override
-        public ConsolidateInputParcel createFromParcel(Parcel in) {
-            return new ConsolidateInputParcel(in);
-        }
-
-        @Override
-        public ConsolidateInputParcel[] newArray(int size) {
-            return new ConsolidateInputParcel[size];
-        }
-    };
 }
\ No newline at end of file
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java
index ff5fb7cca..cc2dd7131 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ConsolidateDialogActivity.java
@@ -67,7 +67,7 @@ public class ConsolidateDialogActivity extends FragmentActivity
 
     @Override
     public ConsolidateInputParcel createOperationInput() {
-        return new ConsolidateInputParcel(mRecovery);
+        return ConsolidateInputParcel.createConsolidateInputParcel(mRecovery);
     }
 
     @Override
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index cf7540d45..d60f8da32 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -553,7 +553,7 @@ public class KeyListFragment extends RecyclerFragment<KeySectionedListAdapter>
 
             @Override
             public ConsolidateInputParcel createOperationInput() {
-                return new ConsolidateInputParcel(false); // we want to perform a full consolidate
+                return ConsolidateInputParcel.createConsolidateInputParcel(false); // we want to perform a full consolidate
             }
 
             @Override