diff --git a/MessengerProj/src/main/java/com/b44t/ui/PrivacySettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/PrivacySettingsActivity.java
index de9f5a822..003459b7c 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/PrivacySettingsActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/PrivacySettingsActivity.java
@@ -60,6 +60,7 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio
     private int securitySectionRow;
     private int passcodeRow;
     private int secretDetailRow;
+    private int manageKeysRow;
     private int rowCount;
 
     private final int TYPE_TEXTSETTING = 0;
@@ -81,6 +82,7 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio
         blockedRow              = rowCount++;
         passcodeRow             = rowCount++;
         showUnknownSendersRow   = rowCount++;
+        manageKeysRow           = rowCount++;
         securitySectionRow      = -1;
         secretDetailRow         = rowCount++;
 
@@ -138,6 +140,10 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio
                 {
                     Toast.makeText(getParentActivity(), LocaleController.getString("NotYetImplemented", R.string.NotYetImplemented), Toast.LENGTH_SHORT).show();
                 }
+                else if(i==manageKeysRow )
+                {
+                    Toast.makeText(getParentActivity(), LocaleController.getString("NotYetImplemented", R.string.NotYetImplemented), Toast.LENGTH_SHORT).show();
+                }
                 else if(i==readReceiptsRow )
                 {
                     Toast.makeText(getParentActivity(), LocaleController.getString("NotYetImplemented", R.string.NotYetImplemented), Toast.LENGTH_SHORT).show();
@@ -290,6 +296,9 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio
                     String val = UserConfig.passcodeHash.length() > 0? LocaleController.getString("Enabled", R.string.Enabled) : LocaleController.getString("Disabled", R.string.Disabled);
                     textCell.setTextAndValue(LocaleController.getString("Passcode", R.string.Passcode), val, true);
                 }
+                else if( i==manageKeysRow ) {
+                    textCell.setText(LocaleController.getString("E2EManagePrivateKeys", R.string.E2EManagePrivateKeys), true);
+                }
             } else if (type == TYPE_TEXT_INFO) {
                 if (view == null) {
                     view = new TextInfoPrivacyCell(mContext);
@@ -324,7 +333,7 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio
                 }
                 else if( i==showUnknownSendersRow) {
                     textCell.setTextAndCheck(LocaleController.getString("DeaddropInChatlist", R.string.DeaddropInChatlist),
-                            MrMailbox.getConfigInt("show_deaddrop", 0)!=0, false);
+                            MrMailbox.getConfigInt("show_deaddrop", 0)!=0, true);
                 }
             }
             return view;
diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
index b32890a7e..3e033fdea 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
@@ -136,6 +136,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
     private int settingsNotificationsRow = -1;
     private int changeNameRow = -1;
     private int startChatRow = -1;
+    private int compareKeysRow = -1;
     private int addMemberRow = -1;
 
     private int emptyRowChat = -1;
@@ -387,6 +388,10 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                     }
                     presentFragment(new ContactAddActivity(args));
                 }
+                else if(position==compareKeysRow)
+                {
+                    Toast.makeText(getParentActivity(), LocaleController.getString("NotYetImplemented", R.string.NotYetImplemented), Toast.LENGTH_SHORT).show();
+                }
                 else if(position==startChatRow)
                 {
                     int belonging_chat_id = MrMailbox.getChatIdByContactId(user_id);
@@ -455,10 +460,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                         }
                     }
                 }
-                else
-                {
-                    processOnClickOrPress(position);
-                }
             }
         });
 
@@ -495,9 +496,10 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
 
                     }
                     return true;
-                } else
+                }
+                else
                 {
-                    return processOnClickOrPress(position);
+                    return false;
                 }
             }
         });
@@ -623,16 +625,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
         return fragmentView;
     }
 
-    private boolean processOnClickOrPress(final int position) {
-        if (position == changeNameRow) {
-            return true;
-        }
-        else if (position == startChatRow) {
-            return true;
-        }
-        return false;
-    }
-
     @Override
     public void saveSelfArgs(Bundle args) {
         if (chat_id != 0) {
@@ -1112,6 +1104,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
         }
 
         if (user_id != 0) {
+            compareKeysRow = rowCount++;
             startChatRow = rowCount++;
         } else if (chat_id != 0 && chat_id!=MrChat.MR_CHAT_ID_DEADDROP ) {
             addMemberRow = rowCount++;
@@ -1325,6 +1318,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                     textCell.setTextColor(0xff212121);
                     if (i == changeNameRow) {
                         textCell.setText(LocaleController.getString("EditName", R.string.EditName));
+                    } else if (i == compareKeysRow) {
+                        textCell.setText(LocaleController.getString("E2ECompareKeys", R.string.E2ECompareKeys));
                     } else if (i == startChatRow) {
                         textCell.setText(LocaleController.getString("NewChat", R.string.NewChat));
                     } else if (i == settingsNotificationsRow) {
@@ -1351,10 +1346,12 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                 if (user_id != 0) {
                     enabled =  i == settingsNotificationsRow
                             || i == changeNameRow
+                            || i == compareKeysRow
                             || i == startChatRow;
                 } else if (chat_id != 0) {
                     enabled =  i == settingsNotificationsRow
                             || i == changeNameRow
+                            || i== compareKeysRow
                             || i == addMemberRow
                             || (i >= firstMemberRow && i <= lastMemberRow);
                 }
@@ -1381,7 +1378,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                 return typeEmpty;
             } else if (i == sectionRow || i == userSectionRow) {
                 return typeDivider;
-            } else if ( i == changeNameRow || i==startChatRow || i == settingsNotificationsRow || i == addMemberRow) {
+            } else if ( i == changeNameRow || i==compareKeysRow || i==startChatRow || i == settingsNotificationsRow || i == addMemberRow) {
                 return typeTextCell;
             } else if (i >= firstMemberRow && i <= lastMemberRow) {
                 return typeContactCell;
diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml
index 5956ffcf9..90bf49c56 100644
--- a/MessengerProj/src/main/res/values-de/strings.xml
+++ b/MessengerProj/src/main/res/values-de/strings.xml
@@ -546,4 +546,6 @@
     <string name="NoMessagesHint">Nachricht an <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> senden:\n\n• <![CDATA[<b>]]>%2$s<![CDATA[</b>]]> muss hierzu Delta Chat nicht installiert haben.\n\n• Die Zustellung der ersten Nachricht kann einen Moment dauern.</string>
     <string name="E2EEncryption">Ende-zu-Ende-Verschlüsselung</string>
     <string name="SendNRcvReadReceipts">Lesebestätigungen empfangen/senden</string>
+    <string name="E2EManagePrivateKeys">Private Schlüssel verwalten</string>
+    <string name="E2ECompareKeys">Schlüssel vergleichen</string>
 </resources>
diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml
index df1395977..aa82e24b9 100644
--- a/MessengerProj/src/main/res/values/strings.xml
+++ b/MessengerProj/src/main/res/values/strings.xml
@@ -546,4 +546,6 @@
     <string name="NoMessagesHint">Send message to <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>:\n\n• It is okay if  <![CDATA[<b>]]>%2$s<![CDATA[</b>]]> does not use Delta Chat.\n\n• Delivering the first message may take a moment.</string>
     <string name="SendNRcvReadReceipts">Receive and send read receipts</string>
     <string name="E2EEncryption">End-to-end-encryption</string>
+    <string name="E2EManagePrivateKeys">Manage private keys</string>
+    <string name="E2ECompareKeys">Compare keys</string>
 </resources>