diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index ab306ea0e..f3a641dd4 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -21,7 +21,6 @@
     <string name="theme">light</string>
     <bool name="use_subject">true</bool>
     <bool name="use_green_background">true</bool>
-    <bool name="use_larger_font">false</bool>
     <bool name="send_button_status">false</bool>
     <string name="quick_action">recent</string>
     <bool name="show_dynamic_tags">false</bool>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 9cacbf79d..52e02559a 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -9,7 +9,6 @@
 	<dimen name="key_action_width">48dp</dimen>  <!-- icon width (24dp) + 2 * image button padding -->
 	<dimen name="fineprint_size">11sp</dimen>
 	<dimen name="audio_player_width">224dp</dimen>
-	<dimen name="swipe_handle_size">32dp</dimen>
 	<dimen name="avatar_item_distance">16dp</dimen>
 
 	<dimen name="toolbar_elevation">4dp</dimen>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7252c3b9b..00a8e049f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -82,7 +82,6 @@
     <string name="send_unencrypted_message">Send unencrypted message</string>
     <string name="send_message">Send message</string>
     <string name="send_message_to_x">Send message to %s</string>
-    <string name="send_otr_message">Send OTR encrypted message</string>
     <string name="send_omemo_message">Send OMEMO encrypted message</string>
     <string name="send_omemo_x509_message">Send v\\OMEMO encrypted message</string>
     <string name="send_pgp_message">Send OpenPGP encrypted message</string>
@@ -171,9 +170,7 @@
     <string name="attach_record_voice">Record voice</string>
     <string name="account_settings_jabber_id">Jabber ID</string>
     <string name="block_jabber_id">Block Jabber ID</string>
-    <string name="account_settings_password">Password</string>
     <string name="account_settings_example_jabber_id">username@example.com</string>
-    <string name="account_settings_confirm_password">Confirm password</string>
     <string name="password">Password</string>
     <string name="invalid_jid">This is not a valid Jabber ID</string>
     <string name="error_out_of_memory">Out of memory. Image is too large</string>
@@ -199,11 +196,7 @@
     <string name="last_seen_day">last seen 1 day ago</string>
     <string name="last_seen_days">last seen %d days ago</string>
     <string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string>
-    <string name="unknown_otr_fingerprint">Unknown OTR fingerprint</string>
     <string name="openpgp_messages_found">OpenPGP encrypted messages found</string>
-    <string name="your_fingerprint">Your fingerprint</string>
-    <string name="otr_fingerprint">OTR fingerprint</string>
-    <string name="otr_fingerprint_selected_message">OTR fingerprint of message</string>
     <string name="openpgp_key_id">OpenPGP Key ID</string>
     <string name="omemo_fingerprint">OMEMO fingerprint</string>
     <string name="omemo_fingerprint_x509">v\\OMEMO fingerprint</string>
@@ -213,11 +206,9 @@
     <string name="trust_omemo_fingerprints">Trust OMEMO Fingerprints</string>
     <string name="fetching_keys">Fetching keys…</string>
     <string name="done">Done</string>
-    <string name="verify">Verify</string>
     <string name="decrypt">Decrypt</string>
     <string name="conferences">Group chats</string>
     <string name="search">Search</string>
-    <string name="create_contact">Create contact</string>
     <string name="dialog_title_create_contact">Create Contact</string>
     <string name="enter_contact">Enter Contact</string>
     <string name="join_conference">Join group chat</string>
@@ -264,11 +255,8 @@
     <string name="enable">Enable</string>
     <string name="conference_requires_password">Group chat requires password</string>
     <string name="enter_password">Enter password</string>
-    <string name="missing_presence_subscription">Missing presence subscription</string>
     <string name="request_presence_updates">Please request presence updates from your contact first.\n\n<small>This will be used to determine what client(s) your contact is using.</small></string>
     <string name="request_now">Request now</string>
-    <string name="delete_fingerprint">Delete Fingerprint</string>
-    <string name="sure_delete_fingerprint">Are you sure you would like to delete this fingerprint?</string>
     <string name="ignore">Ignore</string>
     <string name="without_mutual_presence_updates"><b>Warning:</b> Sending this without mutual presence updates could cause unexpected problems.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string>
     <string name="pref_security_settings">Security</string>
@@ -292,7 +280,6 @@
     <string name="pref_conference_name_summary">Use subject instead of JID to identify group chats</string>
     <string name="pref_autojoin">Automatically join group chats</string>
     <string name="pref_autojoin_summary">Respect the autojoin flag in group chat bookmarks</string>
-    <string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string>
     <string name="toast_message_omemo_fingerprint">OMEMO fingerprint copied to clipboard!</string>
     <string name="conference_banned">You are banned from this group chat</string>
     <string name="conference_members_only">This group chat is members only</string>
@@ -314,19 +301,8 @@
     <string name="show_qr_code">Show 2D Barcode</string>
     <string name="show_block_list">Show block list</string>
     <string name="account_details">Account details</string>
-    <string name="verify_otr">Verify OTR</string>
-    <string name="remote_fingerprint">Remote Fingerprint</string>
-    <string name="shared_secret_hint">Hint or Question</string>
-    <string name="shared_secret_secret">Shared Secret</string>
     <string name="confirm">Confirm</string>
-    <string name="in_progress">In progress</string>
-    <string name="respond">Respond</string>
-    <string name="secrets_do_not_match">Secrets do not match</string>
     <string name="try_again">Try again</string>
-    <string name="finish">Finish</string>
-    <string name="verified">Verified!</string>
-    <string name="smp_requested">Contact requested SMP verification</string>
-    <string name="no_otr_session_found">No valid OTR session has been found!</string>
     <string name="conversations_foreground_service">Conversations</string>
     <string name="pref_keep_foreground_service">Keep service in foreground</string>
     <string name="pref_keep_foreground_service_summary">Prevents the operating system from killing your connection</string>
@@ -347,36 +323,24 @@
     <string name="file_deleted">The file has been deleted</string>
     <string name="no_application_found_to_open_file">No application found to open file</string>
     <string name="no_application_found_to_open_link">No application found to open link</string>
-    <string name="could_not_verify_fingerprint">Could not verify fingerprint</string>
-    <string name="manually_verify">Manually verify</string>
-    <string name="are_you_sure_verify_fingerprint">Are you sure that you want to verify your contact’s OTR fingerprint?</string>
     <string name="pref_show_dynamic_tags">Dynamic Tags</string>
     <string name="pref_show_dynamic_tags_summary">Display read-only tags underneath contacts</string>
     <string name="enable_notifications">Enable notifications</string>
     <string name="no_conference_server_found">No group chat server found</string>
     <string name="conference_creation_failed">Group chat creation failed!</string>
     <string name="account_image_description">Account avatar</string>
-    <string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string>
     <string name="copy_omemo_clipboard_description">Copy OMEMO fingerprint to clipboard</string>
     <string name="regenerate_omemo_key">Regenerate OMEMO key</string>
     <string name="clear_other_devices">Clear devices</string>
     <string name="clear_other_devices_desc">Are you sure you want to clear all other devices from the OMEMO announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime.</string>
     <string name="error_no_keys_to_trust_server_error">There are no usable keys available for this contact.\nFetching new keys from the server has been unsuccessful. Maybe there is something wrong with your contact’s server.</string>
     <string name="error_no_keys_to_trust_presence">There are no usable keys available for this contact.\nMake sure you have mutual presence subscription.</string>
-    <string name="error_no_keys_to_trust">There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones.</string>
     <string name="error_trustkeys_title">Something went wrong</string>
     <string name="fetching_history_from_server">Fetching history from server</string>
     <string name="no_more_history_on_server">No more history on server</string>
     <string name="updating">Updating…</string>
     <string name="password_changed">Password changed!</string>
     <string name="could_not_change_password">Could not change password</string>
-    <string name="otr_session_not_started">Send a message to start an encrypted chat</string>
-    <string name="ask_question">Ask question</string>
-    <string name="smp_explain_question">If you and your contact have a secret in common that no one else knows (like an inside joke or simply what you had for lunch the last time you met) you can use that secret to verify each other’s fingerprints.\n\nYou provide a hint or a question for your contact who will respond with a case-sensitive answer.</string>
-    <string name="smp_explain_answer">Your contact would like to verify your fingerprint by challenging you with a shared secret. Your contact provided the following hint or question for that secret.</string>
-    <string name="shared_secret_hint_should_not_be_empty">Your hint should not be empty</string>
-    <string name="shared_secret_can_not_be_empty">Your shared secret can not be empty</string>
-    <string name="manual_verification_explanation">Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those.</string>
     <string name="change_password">Change password</string>
     <string name="current_password">Current password</string>
     <string name="new_password">New password</string>
@@ -425,7 +389,6 @@
     <string name="apk">Android App</string>
     <string name="vcard">Contact</string>
     <string name="received_x_file">Received %s</string>
-    <string name="disable_foreground_service">Disable foreground service</string>
     <string name="touch_to_open_conversations">Touch to open Conversations</string>
     <string name="avatar_has_been_published">Avatar has been published!</string>
     <string name="sending_x_file">Sending %s</string>
@@ -526,14 +489,6 @@
     <string name="no_camera_permission">Conversations needs access to the camera</string>
     <string name="sync_with_contacts">Synchronize with contacts</string>
     <string name="sync_with_contacts_long">Conversations wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nConversations will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.</string>
-    <string name="certificate_information">Certificate Information</string>
-    <string name="certificate_subject">Subject</string>
-    <string name="certificate_issuer">Issuer</string>
-    <string name="certificate_cn">Common Name</string>
-    <string name="certificate_o">Organization</string>
-    <string name="certificate_sha1">SHA-1</string>
-    <string name="certicate_info_not_available">(Not available)</string>
-    <string name="certificate_not_found">No certificate found</string>
     <string name="notify_on_all_messages">Notify on all messages</string>
     <string name="notify_only_when_highlighted">Notify only when mentioned</string>
     <string name="notify_never">Notifications disabled</string>
@@ -566,9 +521,7 @@
     <string name="pick_your_username">Pick your username</string>
     <string name="pref_manually_change_presence">Manage availability manually</string>
     <string name="pref_manually_change_presence_summary">Set your availability when editing your status message.</string>
-    <string name="change_presence">Change Presence</string>
     <string name="status_message">Status message</string>
-    <string name="all_accounts_on_this_device">Set for all accounts on this device</string>
     <string name="presence_chat">Free for Chat</string>
     <string name="presence_online">Online</string>
     <string name="presence_away">Away</string>
@@ -576,13 +529,9 @@
     <string name="presence_dnd">Busy</string>
     <string name="secure_password_generated">A secure password has been generated</string>
     <string name="device_does_not_support_battery_op">Your device does not support opting out of battery optimization</string>
-    <string name="show_password">Show password</string>
     <string name="registration_please_wait">Registration failed: Try again later</string>
     <string name="registration_password_too_weak">Registration failed: Password too weak</string>
-    <string name="create_conference">Create group chat</string>
     <string name="dialog_title_create_conference">Create Group Chat</string>
-    <string name="join_or_create_conference">Join or create group chat</string>
-    <string name="conference_subject">Subject</string>
     <string name="choose_participants">Choose participants</string>
     <string name="creating_conference">Creating group chat…</string>
     <string name="invite_again">Invite again</string>
@@ -613,11 +562,6 @@
     <string name="no_permission_to_access_x">No permission to access %s</string>
     <string name="remote_server_not_found">Remote server not found</string>
     <string name="unable_to_update_account">Unable to update account</string>
-    <string name="missing_presence_subscription_with_x">Missing presence subscription with %s.</string>
-    <string name="missing_keys_from_x">Missing OMEMO keys from %s.</string>
-    <string name="missing_omemo_keys">Missing OMEMO keys</string>
-    <string name="wrong_conference_configuration">This is not a private, non-anonymous group chat.</string>
-    <string name="this_conference_has_no_members">There are no members in this group chat.</string>
     <string name="report_jid_as_spammer">Report this JID as sending unwanted messages.</string>
     <string name="pref_delete_omemo_identities">Delete OMEMO identities</string>
     <string name="pref_delete_omemo_identities_summary">Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort.</string>
@@ -716,12 +660,10 @@
     <string name="huawei_protected_apps_summary">To keep receiving notifications, even when the screen is turned off, you need to add Conversations to the list of protected apps.</string>
     <string name="mtm_accept_cert">Accept Unknown Certificate?</string>
     <string name="mtm_trust_anchor">The server certificate is not signed by a known Certificate Authority.</string>
-    <string name="mtm_cert_expired">The server certificate is expired.</string>
     <string name="mtm_accept_servername">Accept Mismatching Server Name?</string>
     <string name="mtm_hostname_mismatch">Server could not authenticate as \&quot;%s\&quot;. The certificate is only valid for:</string>
     <string name="mtm_connect_anyway">Do you want to connect anyway?</string>
     <string name="mtm_cert_details">Certificate details:</string>
-    <string name="mtm_notification">Certificate Verification</string>
     <string name="once">Once</string>
     <string name="qr_code_scanner_needs_access_to_camera">The QR code scanner needs access to the camera</string>
     <string name="pref_scroll_to_bottom">Scroll to bottom</string>