1 files changed, 4 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java
index c35afd4fe..56c004f97 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java
@@ -189,10 +189,13 @@ public class AddSubkeyDialogFragment extends DialogFragment {
                         if (mNoExpiryCheckBox.isChecked()) {
                             expiry = 0L;
                         } else {
-                            Calendar selectedCal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+                            Calendar selectedCal = Calendar.getInstance(TimeZone.getDefault());
                             //noinspection ResourceType
                             selectedCal.set(mExpiryDatePicker.getYear(),
                                     mExpiryDatePicker.getMonth(), mExpiryDatePicker.getDayOfMonth());
+                            // date picker uses default time zone, we need to convert to UTC
+                            selectedCal.setTimeZone(TimeZone.getTimeZone("UTC"));
+                            
                             expiry = selectedCal.getTime().getTime() / 1000;
                         }