diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c57c8280b58afc10875034b3ec6b06122d528a0f..1ff5d5f8e4ed14a8daa50b2e09478323e7b872cc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -331,6 +331,14 @@
         </intent-filter>
     </receiver>
 
+    <receiver android:name=".notifications.DeleteMessageReceiver"
+        android:enabled="true"
+        android:exported="true">
+        <intent-filter>
+            <action android:name="org.smssecure.smssecure.notifications.DELETE_MSGS"/>
+        </intent-filter>
+    </receiver>
+
     <receiver android:name=".notifications.RemoteReplyReceiver"
               android:enabled="true"
               android:exported="false">
diff --git a/res/drawable-hdpi/ic_reply_white_24dp.png b/res/drawable-hdpi/ic_reply_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0424c2bd6d6eaa5fcd3398f71b6e230ffc1caa7b
Binary files /dev/null and b/res/drawable-hdpi/ic_reply_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_reply_white_24dp.png b/res/drawable-mdpi/ic_reply_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..862114b82dafbbf8ca125d02ce7b723e901cf396
Binary files /dev/null and b/res/drawable-mdpi/ic_reply_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_reply_white_24dp.png b/res/drawable-xhdpi/ic_reply_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..885623e4d0bb82cbb39424905a689b9bc6af22c1
Binary files /dev/null and b/res/drawable-xhdpi/ic_reply_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_reply_white_24dp.png b/res/drawable-xxhdpi/ic_reply_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..de0dad2047bd788a1a8fb8481e55a65bb3f80058
Binary files /dev/null and b/res/drawable-xxhdpi/ic_reply_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_reply_white_24dp.png b/res/drawable-xxxhdpi/ic_reply_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed85f50ab94bb216b8369d51e06458591d6a6d5f
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_reply_white_24dp.png differ
diff --git a/res/values-af/distribution-strings.xml b/res/values-af/distribution-strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c13c25a18df0be010b91cdac65c42144e2f812bb
--- /dev/null
+++ b/res/values-af/distribution-strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+
+    These strings are used as the Silence description on various distribution channels.
+
+    To translate these strings see the "Contributing Translations" portion of the README
+
+-->
+
+<resources>
+
+    <string name="Distribution_title">Stilte</string>
+    <string name="Distribution_tagline">Geïnkripteerde SMS/MMS boodskappe maklik gemaak!</string>
+    <string name="Distribution_description">Stilte is \'n SMS/MMS toepassing wat u in staat stel om u privaatheid beskerm terwyl u met vriende kommunikeer.</string>
+    <string name="Distribution_long_description">Stilte is \'n SMS/MMS toepassing wat u in staat stel om u privaatheid beskerm terwyl u met vriende kommunikeer.         Met ingebruikneming van Stilte kan u SMS boodskappe en media versend met volledige privaatheid.          Eienskappe:         * Eenvoudig. Stilte werk soos enige ander SMS toepassing. Daar is geen inteken of nuwe diens waarby u of u vriende hoef aan te sluit nie.         * Betroubaar. Stilte kommunikeer deur geïnkripteerde SMS boodskappe. Geen.eksterne bedieners of internetverbinding word vereis nie.         * Privaat. Stilte verskaf end-tot-end enkripsie vir u boodskappe deur die deeglik ontwikkelde Signal enkripsie protokol.         * Veilig. Alle boodskappe word op die toestel geïnkripteer, so selfs al raak die toestel verlore of word gesteel, bly boodskappe beskermd.         * Oopbron. Stilte is Gratis en Oopbron wat enigiemand in staat stel om die sekuriteit daarvan te bevestig deur die kode te oudit.          Dui asseblief enige goggas, frustrasies of eienskap navrae aan by:         https://github.com/SilenceIM/Silence/issues          Die bronkode is beskikbaar by:         https://github.com/SilenceIM/Silence          Meer besinderhede:         https://silence.im          Privaatheidsbeleid:         https://silence.im/privacy</string>
+
+</resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8dc6fb3f77595c8c8bff682dd409a4434f056633
--- /dev/null
+++ b/res/values-af/strings.xml
@@ -0,0 +1,808 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="yes">Ja</string>
+    <string name="no">Nee</string>
+    <string name="delete">Wis uit</string>
+    <string name="please_wait">Wag asseblief…</string>
+
+    <!-- AbstractNotificationBuilder -->
+    <string name="AbstractNotificationBuilder_new_message">Kitsfris boodskap</string>
+
+    <!-- ApplicationPreferencesActivity -->
+    <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">U het nog nie \'n toegangsfrase gestel nie!</string>
+    <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Wis alle ou boodskappe?</string>
+    <string name="ApplicationPreferencesActivity_delete">Wis</string>
+    <string name="ApplicationPreferencesActivity_disable_storage_encryption">De-aktiveer stoor-enkripsie?</string>
+    <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">Waarskuwing, dit sal stoor-enkripsie vir alle boodskappe en sleutels de-aktiveer. U geïnkripteerde sessies sal voortgesit word maar iemand met fisiese toegang tot u toestel sal hul moontlik kan lees.</string>
+    <string name="ApplicationPreferencesActivity_disable">De-aktiveer</string>
+    <string name="ApplicationPreferencesActivity_sms_enabled">Inkomende SMS ge-aktiveer</string>
+    <string name="ApplicationPreferencesActivity_tap_to_change_your_default_sms_app">Tik om verstek SMS toep te kies</string>
+    <string name="ApplicationPreferencesActivity_sms_disabled">Inkomende SMS ge-deaktiveer</string>
+    <string name="ApplicationPreferencesActivity_tap_to_make_silence_your_default_sms_app">Tik om Stilte u verstek SMS toep te maak</string>
+    <string name="ApplicationPreferencesActivity_on">aan</string>
+    <string name="ApplicationPreferencesActivity_On">Op</string>
+    <string name="ApplicationPreferencesActivity_off">af</string>
+    <string name="ApplicationPreferencesActivity_Off">Af</string>
+    <string name="ApplicationPreferencesActivity_sms">SMS</string>
+    <string name="ApplicationPreferencesActivity_mms">MMS</string>
+    <string name="ApplicationPreferencesActivity_incoming_summary">Inkomend %s</string>
+    <string name="ApplicationPreferencesActivity_privacy_summary">Toegangsfrase %1$s, Skerm sekuriteit %2$s</string>
+    <string name="ApplicationPreferencesActivity_appearance_summary">Tema %1$s, Taal %2$s</string>
+
+    <!-- AppProtectionPreferenceFragment -->
+
+    <!-- DraftDatabase -->
+    <string name="DraftDatabase_Draft_image_snippet">(beeld)</string>
+    <string name="DraftDatabase_Draft_audio_snippet">(klanksnit)</string>
+    <string name="DraftDatabase_Draft_video_snippet">(kortfilm)</string>
+
+    <!-- AttchmentManager -->
+    <string name="AttachmentManager_cant_open_media_selection">Kannie \'n toep vind om media te selekteer nie.</string>
+
+    <!-- AttachmentTypeSelectorAdapter -->
+    <string name="AttachmentTypeSelectorAdapter_camera">Kamerabeeld</string>
+    <string name="AttachmentTypeSelectorAdapter_picture">Prent</string>
+    <string name="AttachmentTypeSelectorAdapter_video">Kortfilm</string>
+    <string name="AttachmentTypeSelectorAdapter_audio">Klanksnit</string>
+    <string name="AttachmentTypeSelectorAdapter_contact">Kontak informasie</string>
+
+    <!-- AudioSlidePlayer -->
+    <string name="AudioSlidePlayer_error_playing_audio">Terugspeelfout vir klanksnit!</string>
+
+    <!-- BlockedContactsActivity -->
+    <string name="BlockedContactsActivity_blocked_contacts">Geblokkeerde kontakte</string>
+
+    <!-- ConversationItem -->
+    <string name="ConversationItem_message_size_d_kb">Boodskapgrootte: %d kilogrepe</string>
+    <string name="ConversationItem_expires_s">Verval: %s</string>
+    <string name="ConversationItem_error_not_delivered">Nie afgelewer nie</string>
+    <string name="ConversationItem_view_secure_media_question">Besigtig sekure media?</string>
+    <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Hierdie media is gestoor in \'n geïnkripteerde databasis. Om dit te kan besigtig met \'n eksterne toep vereis tans dat die data tydelik gedekripteer word en na geheue geskryf word. Is u seker dat u dit wil toelaat?</string>
+    <string name="ConversationItem_error_received_stale_key_exchange_message">Vervalle steuteluitruil boodskap ontvang.</string>
+    <string name="ConversationItem_received_key_exchange_message_tap_to_process">\'n Sleuteluitruil boodskap is ontvang, tik om te verwerk.</string>
+    <string name="ConversationItem_group_action_left">%1$s het die groepie verlaat.</string>
+    <string name="ConversationItem_click_for_details">Tik vir besonderhede</string>
+    <string name="ConversationItem_unable_to_open_media">Kannie \'n toep vind wat hierdie mediabrokkie kan oopmaak nie.</string>
+    <string name="ConversationItem_from_s">vanaf %s</string>
+    <string name="ConversationItem_to_s">na %s</string>
+    <string name="ConversationItem_xmpp_address_update_silence">XMPP-adres. Dateer Stilte op om die funksie te aktiveer.</string>
+
+    <!-- ConversationActivity -->
+    <string name="ConversationActivity_initiate_secure_session_question">Inisieer sekure sessie?</string>
+    <string name="ConversationActivity_initiate_secure_session_with_s_question">Wil u %s betrek by \'n sekure sessie?</string>
+    <string name="ConversationActivity_detected_silence_initiate_session_question">Boodskap is ontvang van iemand met Stilte. Wil u \'n sekure sessie inisieer?</string>
+    <string name="ConversationActivity_abort_secure_session_confirmation">Beëindig sekure sessie?</string>
+    <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Is u seker dat u die sekure sessie wil kortknip?</string>
+    <string name="ConversationActivity_delete_thread_question">Wis gesprek?</string>
+    <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Dit sal alle boodskappe in die gesprek permanent uitwis.</string>
+    <string name="ConversationActivity_add_attachment">Heg aanhangsel aan</string>
+    <string name="ConversationActivity_select_contact_info">Selekteer kontakinformasie</string>
+    <string name="ConversationActivity_compose_message">Skryf boodskap</string>
+    <string name="ConversationActivity_sorry_there_was_an_error_adding_your_attachment">Verskoon tog, maar die byvoeging van u aanhangsel het uitgeloop op \'n foutjie.</string>
+    <string name="ConversationActivity_the_gif_you_selected_was_too_big">Die GIF wat u gekies het is te groot!</string>
+    <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Verskoon tog, maar die verkose kortfilm oorskry die boodskapgrootte beperking (%1$s kilogrepe).</string>
+    <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Verskoon tog, maar die verkose klanksnit oorskry die boodskapgrootte beperking (%1$s kilogrepe).</string>
+    <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Die ontvanger het nie \'n geldige SMS of vonkpos adres nie!</string>
+    <string name="ConversationActivity_message_is_empty_exclamation">Die boodskap wat u probeer stuur is leeg!</string>
+    <string name="ConversationActivity_group_members">Groeplede</string>
+    <string name="ConversationActivity_group_conversation">Groepsgesprek</string>
+    <string name="ConversationActivity_unnamed_group">Onbenoemde groep</string>
+    <string name="ConversationActivity_saved_draft">Stoor konsepkopie</string>
+    <string name="ConversationActivity_invalid_recipient">Ongeldige ontvanger!</string>
+    <string name="ConversationActivity_calls_not_supported">Oproepe word nie ondersteun nie</string>
+    <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Die toestel ondersteun klaarblyklik nie skakelfunksies nie.</string>
+    <string name="ConversationActivity_cant_open_link">Kannie \'n toep vind om die skakel te open nie.</string>
+    <string name="ConversationActivity_transport_insecure_sms">Ongesekuurde SMS</string>
+    <string name="ConversationActivity_transport_insecure_mms">Ongesekuurde MMS</string>
+    <string name="ConversationActivity_transport_secure_sms">Ongesekuurde SMS</string>
+    <string name="ConversationActivity_transport_secure_mms">Sekure MMS</string>
+    <string name="ConversationActivity_install_smssecure">Kom ons gesels sekuur: %s</string>
+    <string name="ConversationActivity_recipient_self">Sekure sessie kan slegs met ander persone opgestel word.</string>
+    <string name="ConversationActivity_mms_not_supported_title">MMS moontlik nie ondersteun</string>
+    <string name="ConversationActivity_mms_not_supported_message">Die boodskap kannie gestuur word nie aangesien u diensverskaffer moontlik nie MMS ondersteun nie.</string>
+    <string name="ConversationActivity_specify_recipient">Kies asseblief \'n kontak</string>
+    <string name="ConversationActivity_attachment_exceeds_size_limits">Aanhangsel oorskry grootte limiet.</string>
+
+    <!-- ConversationAdapter -->
+
+    <!-- ConversationFragment -->
+    <string name="ConversationFragment_message_details">Boodskap besonderhede</string>
+    <string name="ConversationFragment_save_to_sd_card">Stoor na geheue?</string>
+    <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Kon nie na geheue skryf nie!</string>
+    <string name="ConversationFragment_collecting_attahments">Versamel aanhangsels…</string>
+    <string name="ConversationFragment_pending">Wagtend…</string>
+    <string name="ConversationFragment_mms">MMS</string>
+    <string name="ConversationFragment_sms">SMS</string>
+    <string name="ConversationFragment_deleting">Wis tans…</string>
+    <string name="ConversationFragment_deleting_messages">Wis tans boodskappe uit…</string>
+
+    <!-- ConversationListActivity -->
+    <string name="ConversationListActivity_search">Soek</string>
+
+    <!-- ConversationListFragment -->
+    <string name="ConversationListFragment_deleting">Wis tans uit</string>
+    <string name="ConversationListFragment_deleting_selected_conversations">Wis tans verkose gesprekke uit…</string>
+    <string name="ConversationListFragment_undo">ONTDOEN</string>
+    <string name="ConversationListFragment_send_drafts">Stuur konsepkopieë</string>
+    <string name="ConversationListFragment_this_will_send_drafts_of_selected_conversations">Dit sal die konsepkopië van verkose gesprekke stuur.</string>
+    <string name="ConversationListFragment_send">Stuur</string>
+    <string name="ConversationListFragment_sending">Stuur tans</string>
+    <string name="ConversationListFragment_sending_selected_drafts">Stuur tans verkose konsepkopieë…</string>
+
+    <!-- ConversationListItemAction -->
+    <string name="ConversationListItemAction_archived_conversations_d">Gestoorde boodskappe (%d)</string>
+
+    <!-- CustomDefaultPreference -->
+    <string name="CustomDefaultPreference_using_custom">Gebruik pasgemaakte: %s</string>
+    <string name="CustomDefaultPreference_using_default">Gebruik verstek: %s</string>
+    <string name="CustomDefaultPreference_none">Geen</string>
+
+    <!-- DateUtils -->
+    <string name="DateUtils_now">Sopas</string>
+    <string name="DateUtils_minutes_ago">%d min</string>
+    <string name="DateUtils_today">Vandag</string>
+    <string name="DateUtils_yesterday">Gister</string>
+
+    <!-- ShareActivity -->
+    <string name="ShareActivity_share_with">Deel met</string>
+
+    <!-- IntroScreenActivity -->
+    <string name="IntroScreenActivity_welcome_to_silence">Welkom by Stilte!</string>
+    <string name="IntroScreenActivity_silence_description">Stilte stel u instaat om tydens kommunilasie met vriende u privaatheid te beskerm.</string>
+    <string name="IntroScreenActivity_encrypt_your_messages">Inkripteer u boodskappe</string>
+    <string name="IntroScreenActivity_encrypt_your_messages_description">Stilte sal boodskappe met ander Stilte-gebruikers outomaties inkripteer.</string>
+    <string name="IntroScreenActivity_talk_to_everyone">Gesels met almal</string>
+    <string name="IntroScreenActivity_talk_to_everyone_description">Stilte kan deur ongeïnkripteerde boodskappe met nie-Stilte gebruikers klets.</string>
+    <string name="IntroScreenActivity_smssecure_is_now_silence">SMSSecure is nou Stilte.</string>
+    <string name="IntroScreenActivity_your_messages_are_still_here">SMSSecure is nou Stilte. U boodskappe is steeds hier en nuwe eienskappe is in die pyplyn.</string>
+
+    <!-- ExportFragment -->
+    <string name="ExportFragment_export">Voer uit</string>
+    <string name="ExportFragment_export_plaintext_to_storage">Voer ongeïnkripteerd na geheue uit?</string>
+    <string name="ExportFragment_warning_this_will_export_the_contents_of_your_messages_to_storage_in_plaintext">Waarskuwing, dit sal die inhoud van u Stilte boodskappe ongeïnkripteerd na geheue uitvoer.</string>
+    <string name="ExportFragment_cancel">Kanseleer</string>
+    <string name="ExportFragment_exporting">Voer tans uit</string>
+    <string name="ExportFragment_exporting_plaintext_to_storage">Voer tans ongeïnkripteerd na geheue uit…</string>
+    <string name="ExportFragment_error_unable_to_write_to_storage">Gefaal om na geheue te skryf.</string>
+    <string name="ExportFragment_error_while_writing_to_storage">Fout tydens skryf na geheue.</string>
+    <string name="ExportFragment_export_successful">Suksesvolle uitvoer.</string>
+    <string name="ExportFragment_export_encrypted_backup">Voer geïnkripteerde rugsteunkopie uit?</string>
+    <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Dit sal al u geïnkripteerde sleutels, verstellings en boodskappe na geheue uitvoer.</string>
+    <string name="ExportFragment_exporting_keys_settings_and_messages">Voer tans geïnkripteerde sleutels, verstellings en boodskappe uit…</string>
+
+    <!-- GroupCreateActivity -->
+    <string name="GroupCreateActivity_actionbar_title">Nuwe groep</string>
+    <string name="GroupCreateActivity_actionbar_update_title">Bring groep op datum</string>
+    <string name="GroupCreateActivity_actionbar_mms_title">Nuwe MMS groep</string>
+    <string name="GroupCreateActivity_contacts_mms_exception">Kon jeens \'n onvoorsiene fout nie \'n groep skep nie.</string>
+    <string name="GroupCreateActivity_contacts_no_members">U benodig minstens een persoon in u groep!</string>
+    <string name="GroupCreateActivity_menu_create_title">Skep groep</string>
+
+    <!-- GroupMembersDialog -->
+    <string name="GroupMembersDialog_me">Ek</string>
+
+    <!-- ImportExportActivity -->
+    <string name="ImportExportActivity_import">Voer in</string>
+    <string name="ImportExportActivity_export">Voer uit</string>
+
+    <!-- ImportFragment -->
+    <string name="ImportFragment_import_system_sms_database">Voer sisteem SMS databasis in?</string>
+    <string name="ImportFragment_this_will_import_messages_from_the_system">Dit sal boodskappe vanaf die toestel se verstek SMS databasis na Stilte invoer. Indien u reeds die toestel se SMS databasis ingevoer het, sal die herinvoer lei tot duplikaat boodskappe.</string>
+    <string name="ImportFragment_import">Invoer</string>
+    <string name="ImportFragment_cancel">Kanseleer</string>
+    <string name="ImportFragment_restore_encrypted_backup">Herstel geïnkripteerde rugsteun?</string>
+    <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">Die herstel van \'n geïnkripteerde rugsteun sal al u bestaande sleutels, voorkeure en boodskappe vervang. U sal alle informasie verloor wat in u huidige Stilte installasie is uitgesluit gerugsteunde data. Stilte sal stop net na die invoer.</string>
+    <string name="ImportFragment_import_plaintext_backup">Voer ongeïnkripteerde rugsteun in?</string>
+    <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Dit sal boodskappe vanaf \'n ongeïnkripteerde rugsteun invoer. Indien u voorheen hierdie rugsteun ingevoer het sal die herinvoer lei tot duplikaat boodskappe.</string>
+    <string name="ImportFragment_importing">Voer tans in</string>
+    <string name="ImportFragment_import_plaintext_backup_elipse">Voer tans ongeïnkripteerde rugsteun in…</string>
+    <string name="ImportFragment_no_plaintext_backup_found">Geen ongeïnkripteerde rugsteun gevind nie!</string>
+    <string name="ImportFragment_error_importing_backup">Fout tydens invoer van rugsteun!</string>
+    <string name="ImportFragment_import_complete">Invoer voltooid!</string>
+    <string name="ImportFragment_restoring_encrypted_backup">Herstel tans geïnkripteerde rugsteun…</string>
+    <string name="ImportFragment_no_encrypted_backup_found">Geen geïnkripteerde rugsteun gevind nie!</string>
+
+    <!-- KeyScanningActivity -->
+    <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Geen geskandeerde steutel gevind nie.</string>
+    <string name="KeyScanningActivity_install_barcode_Scanner">Installeer Barcode Scanner?</string>
+    <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Stilte vereis \"Barcode Scanner\" vir QR kodes.</string>
+
+    <!-- MessageDetailsRecipient -->
+    <string name="MessageDetailsRecipient_failed_to_send">Versending het gefaal</string>
+    <string name="MessageDetailsRecipient_new_identity">Nuwe identiteit</string>
+
+    <!-- MmsDownloader -->
+    <string name="MmsDownloader_error_storing_mms">Fout tydens stoor van MMS!</string>
+    <string name="MmsDownloader_error_connecting_to_mms_provider">Fout tydens verbinding met MMS verskaffer</string>
+    <string name="MmsDownloader_error_reading_mms_settings">Fout tydens die lees van verskaffer se MMS instellings</string>
+
+    <!-- NotificationMmsMessageRecord -->
+    <string name="NotificationMmsMessageRecord_multimedia_message">Multimedia boodskap</string>
+
+    <!-- MessageRecord -->
+    <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Het \'n boodskap ontvang wat geïnkripteer is deur \'n ou weergawe van Stilte wat nie meer ondersteun word nie. Vra asseblief die sender om op te gradeer na die nuutste weergawe en die boodskap weer te stuur.</string>
+    <string name="MessageRecord_the_exchange_message_you_got_came_from_a_version_of_silence_that_is_too_outdated">The uitruilboodskap wat u ontvang het is afkomstig van \'n verouderde weergawe van Stilte wat nie met u weergawe kan kommunikeer nie. U moet die boodskap handmatig versend om \'n sekure sessie te loods. Tik om die sleuteluitruilboodskap te versend.</string>
+    <string name="MessageRecord_left_group">U het die groep verlaat.</string>
+    <string name="MessageRecord_updated_group">Groep op datum gebring.</string>
+    <string name="MessageRecord_key_exchange_message">Sleuteluitruil boodskap</string>
+
+    <!-- PassphraseChangeActivity -->
+    <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Toegangsfrases stem nie ooreen nie!</string>
+    <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Ongeldige ou toegangsfrase!</string>
+    <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Geen toegangsfrase ingesleutel nie!</string>
+
+    <!-- PassphrasePromptActivity -->
+    <string name="PassphrasePromptActivity_enter_passphrase">Sleutel toegangsfrase in</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Stilte ikoon</string>
+    <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ongeldige toegangsfrase!</string>
+
+    <!-- ReceiveKeyActivity -->
+    <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Die digitale handtekening op die sleuteluitruil verskil van wat voorheen ontvang is van dié kontak. Dit kan beteken dat iemand probeer om in te luister of dat die ander party eenvoudig Stilte weer geïnstalleer het en nou \'n nuwe identiteitssleutel het.</string>
+    <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Die handtekening op die sleuteluitruil is vertroud, maar u het die \'voltooi outomaties sleutelwissel\' instelling gedeaktiveer.</string>
+    <string name="ReceiveKeyActivity_processing">Verwerk tans</string>
+    <string name="ReceiveKeyActivity_processing_key_exchange">Verwerk tans sleutel uitruil…</string>
+    <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">U behoort die identiteit van hierdie kontak te verifieer.</string>
+
+    <!-- RecipientPreferencesActivity -->
+    <string name="RecipientPreferenceActivity_block_this_contact_question">Sper hierdie kontak?</string>
+    <string name="RecipientPreferenceActivity_you_will_no_longer_see_messages_from_this_user">U sal voorts geen boodskappe van hierdie gebruiker sien nie.</string>
+    <string name="RecipientPreferenceActivity_block">Sper</string>
+    <string name="RecipientPreferenceActivity_unblock_this_contact_question">Ontsper hierdie kontak?</string>
+    <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Is u seker dat u hierdie kontak wil ontsper?</string>
+    <string name="RecipientPreferenceActivity_unblock">Ontsper</string>
+    <string name="RecipientPreferenceActivity_enabled">Geaktiveer</string>
+    <string name="RecipientPreferenceActivity_disabled">Gedeaktiveer</string>
+
+    <!-- Slide -->
+    <string name="Slide_image">Beeld</string>
+    <string name="Slide_audio">Klank</string>
+    <string name="Slide_video">Kortfilm</string>
+
+    <!-- SmsMessageRecord -->
+    <string name="SmsMessageRecord_received_corrupted_key_exchange_message">\'n Korrupte sleutelwissel boodskap is ontvang!</string>
+    <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\'n Sleutelwissel boodskap met ongeldige protokol weergawe is ontvang.</string>
+    <string name="SmsMessageRecord_received_message_with_unknown_identity_key_tap_to_process">\'n Boodskap met \'n onbekende identiteitssleutel is ontvang. Tik om te verwerk en te vertoon.</string>
+    <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Nuwe maar onbekende identiteitsinformasie is ontvang. Tik om identiteit te verifieer.</string>
+    <string name="SmsMessageRecord_secure_session_ended">Sekure sessie beëindig.</string>
+    <string name="SmsMessageRecord_duplicate_message">Duplikaat boodskap.</string>
+
+    <!-- ThreadRecord -->
+    <string name="ThreadRecord_left_the_group">Groep is verlaat</string>
+    <string name="ThreadRecord_draft">Konsepkopie:</string>
+    <string name="ThreadRecord_media_message">Media boodskap</string>
+
+    <!-- VerifyIdentityActivity -->
+    <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">U het nie \'n identiteitssleutel nie.</string>
+    <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Ontvanger het geen identiteitssleutel nie.</string>
+    <string name="VerifyIdentityActivity_scan_contacts_qr_code">Tas kontak se QR kode af</string>
+    <string name="VerifyIdentityActivity_display_your_qr_code">Vertoon u QR kode</string>
+    <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">WAARSKUWING, die afgetaste sleutel stem nie ooreen nie! Gaan asseblief die vingerafdruk deeglik na.</string>
+    <string name="VerifyIdentityActivity_not_verified_exclamation">NIE Geverifieer NIE!</string>
+    <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Hul sleutel is korrek. Dit is ook nodig om u sleutel met hul te verifieer.</string>
+    <string name="VerifyIdentityActivity_verified_exclamation">Geverifieer!</string>
+
+    <!-- ViewIdentityActivity -->
+    <string name="ViewIdentityActivity_scan_contacts_qr_code">Tas kontak se QR kode af</string>
+    <string name="ViewIdentityActivity_display_your_qr_code">Vertoon u QR kode</string>
+    <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">WAARSKUWING, die afgetaste sleutel STEM NIE ooreen NIE!</string>
+    <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Die afgetaste sleutel stem ooreen!</string>
+    <string name="ViewIdentityActivity_your_identity_fingerprint">U identiteitsvingerafdruk</string>
+
+    <!-- KeyExchangeInitiator -->
+    <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Inisieer ten spyte van bestaande versoek?</string>
+    <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">U het reeds \'n sessie inisialiseringsversoek na die ontvanger gestuur. Is u seker dat u nog een wil stuur? Dit sal die eerste versoek ongeldig maak.</string>
+    <string name="KeyExchangeInitiator_send">Stuur</string>
+
+    <!-- MessageDisplayHelper -->
+    <string name="MessageDisplayHelper_bad_encrypted_message">Slegte geïnkripteerde boodskap</string>
+    <string name="MessageDisplayHelper_decrypting_please_wait">Ontsyfer tans, wag asseblief…</string>
+    <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Boodskap geïnkripteer vir nie-bestaande sessie</string>
+    <string name="MessageDisplayHelper_end_session_encrypted_for_non_existing_session">Versoek om \'n nie-bestaande sessie te beëindig</string>
+
+    <!-- EncryptingSmsDatabase -->
+    <string name="EncryptingSmsDatabase_error_decrypting_message">Fout tydens ontsyfering van boodskap.</string>
+
+    <!-- MmsDatabase -->
+    <string name="MmsDatabase_connecting_to_mms_server">Verbind tans aan MMS bediener…</string>
+    <string name="MmsDatabase_downloading_mms">Laai tans MMS af…</string>
+    <string name="MmsDatabase_mms_download_failed">MMS aflaai het gefaal!</string>
+    <string name="MmsDatabase_downloading">Laai tans af…</string>
+    <string name="MmsDatabase_mms_pending_download">Tik en verstel MMS instellings om aflaai voort te sit.</string>
+    <string name="MmsDatabase_error_decrypting_message">Fout tydens ontsyfering van boodskap.</string>
+
+    <!-- MmsMessageRecord -->
+    <string name="MmsMessageRecord_decrypting_mms_please_wait">Ontsyfer tans MMS, wag asseblief…</string>
+    <string name="MmsMessageRecord_bad_encrypted_mms_message">Slegte geïnkripteerde MMS boodskap</string>
+    <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS boodskap geïnkripteerd vir nie-bestaande sessie</string>
+
+    <!-- MuteDialog -->
+    <string name="MuteDialog_mute_notifications">Smoor kennisgewings</string>
+
+    <!-- ApplicationMigrationService -->
+    <string name="ApplicationMigrationService_import_in_progress">Inlaai vind tans plaas</string>
+    <string name="ApplicationMigrationService_importing_text_messages">Laai teksboodskappe tans in</string>
+    <string name="ApplicationMigrationService_import_complete">Inlaai voltooid</string>
+    <string name="ApplicationMigrationService_system_database_import_is_complete">Sisteem databasis inlaai is voltooid.</string>
+
+    <!-- KeyCachingService -->
+    <string name="KeyCachingService_silence_passphrase_cached">Tik om oop te maak.</string>
+    <string name="KeyCachingService_silence_passphrase_cached_with_lock">Tik om oop te maak óf tik die slotjie om te sluit.</string>
+    <string name="KeyCachingService_passphrase_cached">Stilte is ontsluit</string>
+    <string name="KeyCachingService_lock">Sluit met toegangsfrase</string>
+
+    <!-- MessageNotifier -->
+    <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d nuwe boodskappe in %2$d gesprekke</string>
+    <string name="MessageNotifier_most_recent_from_s">Nuutste van: %1$s</string>
+    <string name="MessageNotifier_encrypted_message">Geïnkripteerde boodskap</string>
+    <string name="MessageNotifier_media_message_with_text">Media boodskap: %s</string>
+    <string name="MessageNotifier_no_subject">(Geed onderwerp)</string>
+    <string name="MessageNotifier_message_delivery_failed">Boodskap aflewering het gefaal.</string>
+    <string name="MessageNotifier_failed_to_deliver_message">Gefaal om boodskap af te lewer.</string>
+    <string name="MessageNotifier_error_delivering_message">Fout tydens boodskap aflewering.</string>
+    <string name="MessageNotifier_mark_all_as_read">Merk alles as gelees</string>
+    <string name="MessageNotifier_mark_read">Merk as gelees</string>
+    <string name="MessageNotifier_media_message">Media boodskap</string>
+    <string name="MessageNotifier_message_received">Boodskap is ontvang deur %s.</string>
+    <string name="MessageNotifier_reply">Antwoord</string>
+
+    <!-- QuickResponseService -->
+    <string name="QuickResponseService_quick_response_unavailable_when_Silence_is_locked">Snelbeantwoording is nie beskikbaar onderwyl Stilte gesluit is nie!</string>
+    <string name="QuickResponseService_problem_sending_message">Probleem tydens versending van boodskap!</string>
+
+    <!-- SingleRecipientNotificationBuilder -->
+    <string name="SingleRecipientNotificationBuilder_silence">Stilte</string>
+    <string name="SingleRecipientNotificationBuilder_new_message">Nuwe boodskap</string>
+
+    <!-- change_passphrase_activity -->
+    <string name="change_passphrase_activity__old_passphrase">Ou toegangsfrase</string>
+    <string name="change_passphrase_activity__new_passphrase">Nuwe toegangsfrase</string>
+    <string name="change_passphrase_activity__repeat_new_passphrase">Herhaal nuwe toegangsfrase</string>
+
+    <!-- contact_selection_activity -->
+    <string name="contact_selection_activity__enter_name_or_number">Voer naam of nommer in</string>
+
+    <!-- contact_selection_group_activity -->
+    <string name="contact_selection_group_activity__no_contacts">Geen kontakte.</string>
+    <string name="contact_selection_group_activity__finding_contacts">Laai tans kontakte…</string>
+
+    <!-- single_contact_selection_activity -->
+    <string name="SingleContactSelectionActivity_contact_photo">Kontakfoto</string>
+
+    <!-- ContactSelectionListFragment-->
+    <string name="ContactSelectionlistFragment_select_for">Selekteer vir</string>
+
+    <!-- blocked_contacts_fragment -->
+    <string name="blocked_contacts_fragment__no_blocked_contacts">Geen versperde kontakte</string>
+
+    <!-- contact_selection_recent_activity -->
+    <string name="contact_selection_recent_activity__no_recent_calls">Geen onlangse oproepe.</string>
+
+    <!-- conversation_title_view -->
+    <string name="conversation_title_view__conversation_muted">Gesprek gesmoor</string>
+
+    <!-- conversation_activity -->
+    <string name="conversation_activity__type_message_sms_secure">Stuur sekure SMS</string>
+    <string name="conversation_activity__type_message_sms_insecure">Stuur nie sekure SMS</string>
+    <string name="conversation_activity__type_message_mms_secure">Stuur sekure MMS</string>
+    <string name="conversation_activity__type_message_mms_insecure">Stuur nie sekure MMS</string>
+    <string name="conversation_activity__from_sim_name">Vanaf %1$s</string>
+    <string name="conversation_activity__send">Stuur</string>
+    <string name="conversation_activity__remove">Verwyder</string>
+    <string name="conversation_activity__window_description">Gesprek met %1$s</string>
+    <string name="conversation_activity__compose_description">Boodskap samestelling</string>
+    <string name="conversation_activity__emoji_toggle_description">Wisselskakel emoji sleutelbord</string>
+    <string name="conversation_activity__attachment_thumbnail">Aanhangsel Miniatuur</string>
+
+    <!-- conversation_item -->
+    <string name="conversation_item__mms_downloading_description">Media boodskap laai tans af</string>
+    <string name="conversation_item__mms_image_description">Media boodskap</string>
+    <string name="conversation_item__secure_message_description">Sekure boodskap</string>
+
+    <!-- conversation_item_sent -->
+    <string name="conversation_item_sent__download">Laai af</string>
+    <string name="conversation_item_sent__downloading">Laai tans af</string>
+    <string name="conversation_item_sent__send_failed_indicator_description">Stuur Gefaal</string>
+    <string name="conversation_item_sent__pending_approval_description">Goedkeuring In Pyplyn</string>
+    <string name="conversation_item_sent__delivered_description">Afgelewer</string>
+
+    <!-- conversation_item_received -->
+    <string name="conversation_item_received__download">Laai af</string>
+    <string name="conversation_item_received__contact_photo_description">Kontakfoto</string>
+    <string name="conversation_item_received__downloading">Laai tans af</string>
+
+    <!-- audio_view -->
+    <string name="audio_view__play_accessibility_description">Speel</string>
+    <string name="audio_view__pause_accessibility_description">Vries</string>
+    <string name="audio_view__download_accessibility_description">Laai af</string>
+
+    <!-- conversation_fragment_cab -->
+    <string name="conversation_fragment_cab__batch_selection_mode">Groep kiesmodus</string>
+    <string name="conversation_fragment_cab__batch_selection_amount">%s gekies</string>
+
+    <!-- conversation_fragment -->
+    <string name="conversation_fragment__scroll_to_the_bottom_content_description">Skuifrol tot onder</string>
+
+    <!-- import_export_fragment -->
+    <string name="import_export_fragment__export">Voer uit</string>
+    <string name="import_export_fragment__import">Voer in</string>
+
+    <!-- log_submit_activity -->
+    <string name="log_submit_activity__log_fetch_failed">Kon nie die joernaal op u toestel lees nie. U kan steeds ADB nuttig om \'n ontfoutjoernaal te verkry.</string>
+    <string name="log_submit_activity__thanks">Dankie vir u hulp!</string>
+    <string name="log_submit_activity__submitting">Dien tans in</string>
+    <string name="log_submit_activity__posting_logs">Plaas tans die foutjoernale na gist…</string>
+
+    <!-- database_migration_activity -->
+    <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Sou u verkies om u bestaande teksboodskappe in Stilte se geïnkripteerde databasis in te voer?</string>
+    <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Die verstek toestel databasis sal nie gewysig word nie.</string>
+    <string name="database_migration_activity__skip">Slaan oor</string>
+    <string name="database_migration_activity__import">Voer in</string>
+    <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Dit mag \'n rukkie neem. Wees liefs geduldig. U sal in kennis gestel word sodra die invoer voltooid is.</string>
+    <string name="database_migration_activity__importing">VOER TANS IN</string>
+
+    <!-- database_upgrade_activity -->
+    <string name="database_upgrade_activity__updating_database">Dateer tans databasis op…</string>
+
+    <string name="export_fragment__export_plaintext_backup">Voer ongeïnkripteerde rugsteun uit</string>
+    <string name="export_fragment__export_a_plaintext_backup_compatible_with">Voer \'n ongeïnkripteerde rugsteun wat versoenbaar is met \'SMS Backup &amp; Restore\' na geheue uit</string>
+    <string name="import_fragment__import_system_sms_database">Voer toestel SMS databasis in</string>
+    <string name="import_fragment__import_the_database_from_the_default_system">Voer die databasis in vanaf die verstek toestel boodskapper toep</string>
+    <string name="import_fragment__restore_encrypted_backup">Herstel \'n geïnkripteerde rugsteun</string>
+    <string name="import_fragment__restore_a_previously_exported_encrypted_backup">Herstel \'n voorheen uitgevoerde geïnkripteerde rugsteun.</string>
+    <string name="import_fragment__import_plaintext_backup">Voer ongeïnkripteerde rusteun in</string>
+    <string name="import_fragment__import_a_plaintext_backup_file">Voer \'n ongeïnkripteerde rugsteundokument in. Een wat versoenbaar is met \'SMS Backup &amp; Restore.\'</string>
+    <string name="export_fragment__export_encrypted_backup">Voer geïnkripteerde rugsteun uit</string>
+    <string name="export_fragment__export_an_encrypted_backup_to_storage">Voer \'n geïnkripteerde rugsteun na geheue uit</string>
+
+    <!-- load_more_header -->
+    <string name="load_more_header__see_full_conversation">Sien volle gesprek</string>
+
+    <!-- media_overview_activity -->
+    <string name="media_overview_activity__no_images">Geen prente</string>
+
+    <!-- message_recipients_list_item -->
+    <string name="message_recipients_list_item__verify">VERIFIEER</string>
+    <string name="message_recipients_list_item__resend">HERSTUUR</string>
+
+    <!-- prompt_passphrase_activity -->
+    <string name="prompt_passphrase_activity__unlock">Ontsluit</string>
+
+    <!-- prompt_mms_activity -->
+    <string name="prompt_mms_activity__silence_requires_mms_settings_to_deliver_media_and_group_messages">Stilte benodig MMS verstellings om media en groepboodskappe te stuur deur u diensverskaffer. U toestel maak nie hierdie informasie beskikbaar nie, wat somtyds so is vir geslote toestelle en ander beperkte konfigurasies.</string>
+    <string name="prompt_mms_activity__to_send_media_and_group_messages_tap_ok">Om media en ander groep boodskappe te kan stuur, Tik \'Reg\' en voltooi die vereiste instellings. Die MMS instellings vir u diensverskaffer kan gewoonlik vasgestel word deur vir \'u diensverskaffer APN\' te soek. U behoort dit net eenmalig te doen.</string>
+
+    <!-- recipient_preferences_activity -->
+    <string name="recipient_preference_activity__blocked">IS VERSPER</string>
+
+    <!-- recipient_preferences -->
+    <string name="recipient_preferences__mute_conversation">Smoor gesprek</string>
+    <string name="recipient_preferences__disable_notifications_for_this_conversation">Deaktiveer kennisgewings vir hierdie gesprek</string>
+    <string name="recipient_preferences__notification_sound">Kennisgewing klank</string>
+    <string name="recipient_preferences__vibrate">Vibreer</string>
+    <string name="recipient_preferences__block">Versper</string>
+    <string name="recipient_preferences__color">Kleur</string>
+    <string name="recipient_preferences__color_for_this_contact">Kleur vir die kontak</string>
+
+    <!-- receive_key_dialog -->
+    <string name="receive_key_activity__complete">Voltooi</string>
+
+    <!-- recipients_panel -->
+    <string name="recipients_panel__to"><small >Lees naam of nommer in</small></string>
+    <string name="recipients_panel__add_member">Voeg lid by</string>
+
+    <!-- verify_identity_activity -->
+    <string name="verify_identity_activity__their_identity_they_read">Hul identiteit (hul lees):</string>
+    <string name="verify_identity_activity__your_identity_you_read">U identiteit (u lees):</string>
+
+    <!-- message_details_header -->
+    <string name="message_details_header__issues_need_your_attention">Sommige sake vereis u aandag.</string>
+    <string name="message_details_header__sent">Gestuur</string>
+    <string name="message_details_header__received">Ontvang</string>
+    <string name="message_details_header__via">Via</string>
+    <string name="message_details_header__to">Aan:</string>
+    <string name="message_details_header__from">Vanaf:</string>
+    <string name="message_details_header__with">Met:</string>
+
+    <!-- AndroidManifest.xml -->
+    <string name="AndroidManifest__create_passphrase">Skep toegangsfrase</string>
+    <string name="AndroidManifest__enter_passphrase">Sleutel toegangsfrase in</string>
+    <string name="AndroidManifest__select_contacts">Selekteer kontakte</string>
+    <string name="AndroidManifest__public_identity_key">Publieke identiteitssleutel</string>
+    <string name="AndroidManifest__change_passphrase">Wysig toegangsfrase</string>
+    <string name="AndroidManifest__verify_identity">Verifieer identiteit</string>
+    <string name="AndroidManifest__complete_key_exchange">Voltooi sleuteluitruil</string>
+    <string name="AndroidManifest__log_submit">Stuur ontfoutingslog</string>
+    <string name="AndroidManifest__media_preview">Media voorskou</string>
+    <string name="AndroidManifest__media_overview">Alle prente</string>
+    <string name="AndroidManifest__media_overview_named">Alle prente met %1$s</string>
+    <string name="AndroidManifest__message_details">Boodskap besonderhede</string>
+    <string name="AndroidManifest_archived_conversations">Gestoorde gesprekke</string>
+    <string name="AndroidManifest_configure_mms_settings">Verstel MMS Instellings</string>
+
+    <!-- arrays.xml -->
+    <string name="arrays__import_export">Invoer / uitvoer</string>
+    <string name="arrays__your_identity_key">U identiteitssleutel</string>
+    <string name="arrays__use_default">Gebruik verstek</string>
+    <string name="arrays__use_custom">Gebruik pasgemaak</string>
+
+    <string name="arrays__mute_for_one_hour">Smoor vir 1 uur</string>
+    <string name="arrays__mute_for_two_hours">Smoor vir 2 ure</string>
+    <string name="arrays__mute_for_one_day">Smoor vir 1 dag</string>
+    <string name="arrays__mute_for_seven_days">Smoor vir 7 dae</string>
+    <string name="arrays__mute_for_one_year">Smoor vir 1 jaar</string>
+
+    <string name="arrays__settings_default">Instellings verstek</string>
+    <string name="arrays__enabled">Geaktiveer</string>
+    <string name="arrays__disabled">Gedeaktiveer</string>
+
+    <string name="arrays__name_and_message">Naam en boodskap</string>
+    <string name="arrays__name_only">Naam alleenlik</string>
+    <string name="arrays__no_name_or_message">Geen naam of boodskap</string>
+
+    <string name="arrays__enter_key">Vertoon inlees sleutel</string>
+    <string name="arrays__emoji_key">Vertoin emoji sleutel</string>
+    <string name="arrays__send_key">Vertoon stuur knoppie</string>
+
+    <!-- plurals.xml -->
+
+    <!-- preferences.xml -->
+    <string name="preferences__general">Algemeen</string>
+    <string name="preferences__sms_mms">SMS en MMS</string>
+    <string name="preferences__pref_all_sms_title">Ontvang alle SMS</string>
+    <string name="preferences__pref_all_mms_title">Ontvang alle MMS</string>
+    <string name="preferences__use_silence_for_viewing_and_storing_all_incoming_text_messages">Gebruik Stilte om alle inkomende teksboodskappe te aanskou en te stoor</string>
+    <string name="preferences__use_silence_for_viewing_and_storing_all_incoming_multimedia_messages">Gebruik Stilte om alle inkomende multimediaboodskappe te aanskou en te stoor</string>
+    <string name="preferences__keyboard_settings">Sleutelbord opsies</string>
+    <string name="preferences__disable_emoji_drawer">Deaktiveer emojie laai</string>
+    <string name="preferences__enable_this_option_if_your_keyboard_supports_emojis">Aktiveer hierdie opsie indien u sleutelbord emojis ondersteun.</string>
+    <string name="preferences__display_settings">Vertoon instellings</string>
+    <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Kies u kontak inleesopsie vanaf die kontaklys.</string>
+    <string name="preferences__change_passphrase">Wysig toegangsfrase</string>
+    <string name="preferences__change_your_passphrase">Wysig u toegangsfrase</string>
+    <string name="preferences__complete_key_exchanges">Voltooi sleuteluitruilings</string>
+    <string name="preferences__enable_passphrase">Aktiveer toegangsfrase</string>
+    <string name="preferences__enable_local_encryption_of_messages_and_keys">Aktiveer lokale enkripsie van boodskappe en sleutels</string>
+    <string name="preferences__screen_security">Skerm sekuriteit</string>
+    <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Voltooi outomaties sleutelwissel vir nuwe sessies of bestaande sessies met dieselfde identiteitssleutel</string>
+    <string name="preferences__disable_screen_security_to_allow_screen_shots">Versper skermskutte in die onlangse lys en binne die toep</string>
+    <string name="preferences__forget_passphrase_from_memory_after_some_interval">Vereis die toegangsfrase om boodskappe na \'n gegewe tyd te kan besigtig</string>
+    <string name="preferences__timeout_passphrase">Tyduit toegangsfrase</string>
+    <string name="preferences__pref_timeout_interval_dialogtitle">Kies toegangsfrase uittyd</string>
+    <string name="preferences__pref_timeout_interval_title">Tyduit interval</string>
+    <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Die tyd om te wag voor die toegangsfrase uit geheue gewis word</string>
+    <string name="preferences__notifications">Kennisgewings</string>
+    <string name="preferences__enable_message_notifications">Aktiveer boodskap kennisgewings</string>
+    <string name="preferences__led_color">LGD kleur</string>
+    <string name="preferences__led_color_unknown">Onbekend</string>
+    <string name="preferences__pref_led_blink_title">LGD flitspatroon</string>
+    <string name="preferences__pref_led_blink_custom_pattern_title">Stel pasgemaakte LGD flitspatroon</string>
+    <string name="preferences__pref_led_blink_custom_pattern_on_for">Aan vir:</string>
+    <string name="preferences__pref_led_blink_custom_pattern_off_for">Af vir:</string>
+    <string name="preferences__pref_led_blink_custom_pattern_set">Pasgemaakte LGD flitspatroon gestel!</string>
+    <string name="preferences__sound">Klank</string>
+    <string name="preferences__change_notification_sound">Wysig kennisgewing klank</string>
+    <string name="preferences__silent">Stil</string>
+    <string name="preferences__in_conversation_notifications">In-gesprek kennisgewings</string>
+    <string name="preferences__play_inthread_notifications">Speel kennisgewingklank tydens die besigtiging van \'n aktiewe gesprek.</string>
+    <string name="preferences__repeat_alerts">Herhaal kennisgewings</string>
+    <string name="preferences__never">Nooit</string>
+    <string name="preferences__one_time">Een keer</string>
+    <string name="preferences__two_times">Twee maal</string>
+    <string name="preferences__three_times">Drie maal</string>
+    <string name="preferences__five_times">Vyf maal</string>
+    <string name="preferences__ten_times">Tien maal</string>
+    <string name="preferences__vibrate">Virbreer</string>
+    <string name="preferences__also_vibrate_when_notified">Verbreer ook met kennisgewings</string>
+    <string name="preferences__minutes">minute</string>
+    <string name="preferences__hours">ure</string>
+    <string name="preferences__green">Groen</string>
+    <string name="preferences__red">Rooi</string>
+    <string name="preferences__blue">Blou</string>
+    <string name="preferences__orange">Oranje</string>
+    <string name="preferences__cyan">Siaan</string>
+    <string name="preferences__magenta">Magenta</string>
+    <string name="preferences__white">Blank</string>
+    <string name="preferences__none">Geen</string>
+    <string name="preferences__fast">Snel</string>
+    <string name="preferences__normal">Normaal</string>
+    <string name="preferences__slow">Slakkepas</string>
+    <string name="preferences__custom">Pasgemaak</string>
+    <string name="preferences__advanced">Gevorderd</string>
+    <string name="preferences__privacy">Privaatheid</string>
+    <string name="preferences__mms_user_agent">MMS Gebruiker Agent</string>
+    <string name="preferences__advanced_mms_access_point_names">Handmatige MMS instellings</string>
+    <string name="preferences__enable_manual_mms">Gebruik handmatige MMS instellings</string>
+    <string name="preferences__override_system_mms_settings">Verplaas sisteem MMS instellings met die inligting hieronder.</string>
+    <string name="preferences__mmsc_url">MMSC URL</string>
+    <string name="preferences__mms_proxy_host">MMS Instaanbediener Adres</string>
+    <string name="preferences__mms_proxy_port">MMS Instaanbedienerpoort</string>
+    <string name="preferences__mmsc_username">MMSC Gebruikernaam</string>
+    <string name="preferences__mmsc_password">MMSC Sleutelwoord</string>
+    <string name="preferences__sms_delivery_reports">SMS afleweringsverslae</string>
+    <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Versoek \'n afleweringsverslag vir elke SMS boodskap wat u stuur</string>
+    <string name="preferences__sms_delivery_reports_notification">SMS afleweringsverslae kennisgewing</string>
+    <string name="preferences__display_a_notification_when_a_delivery_report_is_received">Vertoon \'n kennisgewing met die ontvangs van \'n afleweringsverslag</string>
+    <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Wis outomaties ouer boodskappe sodra \'n gesprek \'n bepaalde lengte bereik</string>
+    <string name="preferences__delete_old_messages">Wis ou boodskappe</string>
+    <string name="preferences__chats">Kletse en media</string>
+    <string name="preferences__conversation_length_limit">Gesprek lengtebeperking</string>
+    <string name="preferences__trim_all_conversations_now">Kort alle gesprekke nou in</string>
+    <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Gaan alle gesprekke na en forseer lengte beperkinge af</string>
+    <string name="preferences__light_theme">Lig</string>
+    <string name="preferences__dark_theme">Donker</string>
+    <string name="preferences__appearance">Voorkoms</string>
+    <string name="preferences__theme">Tema</string>
+    <string name="preferences__default">Verstek</string>
+    <string name="preferences__language">Taal</string>
+    <string name="preferences__make_default_sms_app">Stel as verstek SMS toep</string>
+    <string name="preferences__make_silence_the_default_sms_mms_app">Maak Stilte die verstek SMS/MMS toepassing vir u sisteem.</string>
+    <string name="preferences__submit_debug_log">Handig ontfoutjoernaal in</string>
+    <string name="preferences__support_wifi_calling">\'Wi-Fi Oproep\' versoeningsmodus</string>
+    <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktiveer indien u toestel SMS/MMS aflewering oor Wi-Fi gebruik (slegs indien \'Wi-Fi Oproepe\' geaktiveer is op u toestel).</string>
+    <string name="preferences__about">Aangaande Stilte</string>
+    <string name="preferences__about_version">Weergawe %s</string>
+    <string name="preferences__privacy_policy">Privaatheidsbeleid</string>
+    <string name="preferences__incognito_keyboard">Geheimsinnige sleutelbord</string>
+    <string name="preferences__request_keyboard_to_disable_personalized_learning">Indien verstel na geheimsinnige modus, sal die sleutelbord nie enige woorde wat u tik, onthou, leer of stoor nie.</string>
+    <string name="preferences_app_protection__blocked_contacts">Versperde kontakte</string>
+    <string name="preferences_notifications__display_in_notifications">Vertoon kennisgewings</string>
+    <string name="preferences__show_sent_time">Vertoon tyd gestuur</string>
+    <string name="preferences__show_sent_time_instead_of_received_time_in_conversations">Vertoon tyd gestuur instede van ontvang vir inkomende boodskappe</string>
+    <string name="preferences__hide_unread_message_divider">Verskans ongeleesde boodskap skeier</string>
+    <string name="preferences_chats__mms">MMS</string>
+    <string name="preferences__auto_retrieve">Outo-aflaai</string>
+    <string name="preferences__automatically_retrieve_mms_messages">Laai outomaties MMS boodskappe af</string>
+    <string name="preferences__roaming_auto_retrieve">Netwerkswerf outo-aflaai</string>
+    <string name="preferences__automatically_retrieve_mms_when_roaming">Laai outomaties MMS boodskappe af tydens netwerkswerwing</string>
+    <string name="preferences_chats__message_trimming">Boodskap inkorting</string>
+    <string name="preferences_advanced__use_system_emoji">Gebruik sisteem emoji</string>
+    <string name="preferences_advanced__disable_silences_built_in_emoji_support">De-aktiveer Stilte se ingeboude emoji ondersteuning</string>
+
+    <!-- **************************************** -->
+    <!-- menus -->
+    <!-- **************************************** -->
+
+    <!-- contact_selection_list -->
+    <string name="contact_selection_list__menu_select_all">Kies alles</string>
+    <string name="contact_selection_list__menu_unselect_all">Ontkies alles</string>
+    <string name="contact_selection_list__header">ALLE KONTAKTE</string>
+    <string name="contact_selection_list__unknown_contact">Nuwe boodskap aan…</string>
+
+    <!-- contact_selection -->
+    <string name="contact_selection__menu_finished">Voltooid</string>
+
+    <!-- refreshing push directory from menu -->
+    <string name="push_directory__menu_refresh">Verfris kontaklys</string>
+
+    <!-- conversation_button_context -->
+    <string name="conversation_button_context__send_secure_sms">Stuur sekure SMS</string>
+    <string name="conversation_button_context__send_insecure_sms">Stuur nie sekure SMS</string>
+    <string name="conversation_button_context__send_secure_mms">Stuur sekure MMS</string>
+    <string name="conversation_button_context__send_insecure_mms">Stuur nie sekure MMS</string>
+
+    <!-- conversation_callable -->
+    <string name="conversation_callable__menu_call">Skakel</string>
+
+    <!-- conversation_context -->
+    <string name="conversation_context__menu_message_details">Boodskapbesonderhede</string>
+    <string name="conversation_context__menu_copy_text">Kopieer teks</string>
+    <string name="conversation_context__menu_delete_message">Wis boodskap</string>
+    <string name="conversation_context__menu_forward_message">Stuur boodskap aan</string>
+    <string name="conversation_context__menu_resend_message">Herstuur boodskap</string>
+
+    <!-- conversation_context_image -->
+    <string name="conversation_context_image__save_attachment">Stoor aanhangsel</string>
+
+    <!-- conversation_insecure -->
+    <string name="conversation_insecure__invite">Nooi uit</string>
+
+    <!-- conversation_insecure_no_push -->
+    <string name="conversation_insecure__menu_start_secure_session">Begin sekure sessie</string>
+    <string name="conversation_insecure__security">Sekuriteit</string>
+
+    <!-- conversation_list_batch -->
+    <string name="conversation_list_batch__menu_delete_selected">Wis gekose</string>
+    <string name="conversation_list_batch__menu_select_all">Kies alles</string>
+    <string name="conversation_list_batch__menu_send_drafts">Stuur verkose konsepkopieë</string>
+    <string name="conversation_list_batch_archive__menu_archive_selected">Stoor verkose</string>
+    <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Ontstoor verkose</string>
+
+    <!-- conversation_list -->
+    <string name="conversation_list__menu_search">Soek</string>
+
+    <!-- conversation_list_item_view -->
+    <string name="conversation_list_item_view__contact_photo_image">Kontak avatar</string>
+    <string name="conversation_list_item_view__error_alert">Foutboodskap</string>
+    <string name="conversation_list_item_view__archived">Gestoor</string>
+
+    <!-- conversation_list_fragment -->
+    <string name="conversation_list_fragment__fab_content_description">Nuwe gesprek</string>
+
+    <!-- conversation_secure_verified -->
+    <string name="conversation_secure_verified__menu_security">Sekuriteit</string>
+    <string name="conversation_secure_verified__menu_verify_identity">Verifieer identiteit</string>
+    <string name="conversation_secure_verified__menu_abort_secure_session">Beëindig sekure sessie</string>
+
+    <!-- conversation_muted -->
+    <string name="conversation_muted__unmute">Ontsmoor</string>
+
+    <!-- conversation_unmuted -->
+    <string name="conversation_unmuted__mute_notifications">Smoor kennisgewings</string>
+
+    <!-- conversation -->
+    <string name="conversation__menu_add_attachment">Heg aanhangsel aan</string>
+    <string name="conversation__menu_delete_conversation">Wis gesprek</string>
+    <string name="conversation__menu_archive_conversation">Stoor gesprek</string>
+    <string name="conversation__menu_unarchive_conversation">Ontstoor gespreek</string>
+    <string name="conversation__menu_view_media">Alle prente</string>
+    <string name="conversation__menu_conversation_settings">Gesprek instellings</string>
+
+    <!-- conversation_popup -->
+    <string name="conversation_popup__menu_expand_popup">Brei opspringer uit</string>
+
+    <!-- conversation_callable -->
+    <string name="conversation_add_to_contacts__menu_add_to_contacts">Voeg by kontakte</string>
+
+    <!-- conversation_group_options -->
+    <string name="convesation_group_options__recipients_list">Ontvangslys</string>
+    <string name="conversation_group_options__delivery">Aflewering</string>
+    <string name="conversation_group_options__conversation">Gesprek</string>
+    <string name="conversation_group_options__broadcast">Loods uitsending</string>
+
+    <!-- key_scanning -->
+    <string name="key_scanning__menu_compare">Vergelyk</string>
+    <string name="key_scanning__menu_display_your_qr_code">Vertoon u QR kode</string>
+    <string name="key_scanning__menu_scan_contacts_qr_code">Tas kontak se QR kode af</string>
+    <string name="share_identity_fingerprint">Deel u identiteitsvingerafdruk</string>
+
+    <!-- text_secure_normal -->
+    <string name="text_secure_normal__menu_new_message">Nuwe boodskap</string>
+    <string name="text_secure_normal__menu_new_group">Nuwe groep</string>
+    <string name="text_secure_normal__menu_settings">Instellings</string>
+    <string name="text_secure_normal__menu_clear_passphrase">Sluit</string>
+    <string name="text_secure_normal__mark_all_as_read">Merk alles as gelees</string>
+    <string name="text_secure_normal__menu_archived_conversations">Stoor gesprekke</string>
+
+    <!-- reminder_header -->
+    <string name="reminder_header_sms_default_title">Gebruik as verstek SMS toep?</string>
+    <string name="reminder_header_sms_default_text_mandatory">Stilte moet u verstek SMS/MMS toep wees om boodskappe te kan ontvang.</string>
+    <string name="reminder_header_sms_default_button">STEL</string>
+    <string name="reminder_header_sms_import_title">Voer toestel SMS in?</string>
+    <string name="reminder_header_sms_import_text">Tik om jou toestel se SMS boodskappe in Stilte se geïnkripteerde databasis in te kopiëer.</string>
+    <string name="reminder_header_sms_import_button">VOER IN</string>
+    <string name="reminder_header_rate_title">Resenseer die toep</string>
+    <string name="reminder_header_rate_text">Indien u die gebruik van die toep geniet, neem asseblief \'n oomblik en help ons deur \'n resensie te loods.</string>
+    <string name="reminder_header_rate_button">RESENSEER NOU!</string>
+    <string name="reminder_header_delivery_reports_title">Aktiveer afleweringsverslae?</string>
+    <string name="reminder_header_delivery_reports_text">Afleweringsverslae stel u in staat om te weet wanneer u ontvanger u boodskappe ontvang het. Sommige netwerke hef \'n addisionele fooi.</string>
+    <string name="reminder_header_delivery_reports_button">AKTIVEER</string>
+    <string name="reminder_header_close_button">SLUIT</string>
+
+    <!-- MediaPreviewActivity -->
+    <string name="MediaPreviewActivity_you">U</string>
+    <string name="MediaPreviewActivity_cant_display">Die beeld se voorskou het gefaal</string>
+    <string name="MediaPreviewActivity_unssuported_media_type">Nie-ondersteunde media tipe</string>
+    <string name="MediaPreviewActivity_draft">Konsepkopie</string>
+
+    <!-- media_preview -->
+    <string name="media_preview__save_title">Stoor</string>
+    <string name="media_preview__forward_title">Stuur aan</string>
+    <string name="media_preview__overview_title">Alle prente</string>
+
+    <!-- media_overview -->
+    <string name="media_overview__save_all">Stoor alles</string>
+
+    <!-- media_preview_activity -->
+    <string name="media_preview_activity__image_content_description">Beeldvoorskou</string>
+
+    <!-- Trimmer -->
+    <string name="trimmer__deleting">Wis tans uit…</string>
+    <string name="trimmer__deleting_old_messages">Wis tans ou boodskappe uit…</string>
+    <string name="trimmer__old_messages_successfully_deleted">Ou boodskappe is suksesvol uitgewis</string>
+
+    <!-- transport_selection_list_item -->
+    <string name="transport_selection_list_item__transport_icon">Draer ikoon</string>
+
+    <!-- EOF -->
+
+</resources>
diff --git a/res/values-af/vector_paths.xml b/res/values-af/vector_paths.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c3d3ee4767234200070cecde91285bdb4ce3e948
--- /dev/null
+++ b/res/values-af/vector_paths.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Play Icon -->
+    <string name="play_icon_upper_path_data">M 44 32 L 44 64 L 100 64 L 100 64 Z</string>
+    <string name="play_icon_bottom_path_data">M 44 96 L 44 64 L 100 64 L 100 64 Z</string>
+
+    <!-- Pause Icon -->
+    <string name="pause_icon_upper_path_data">M 32 40 L 32 56  L 96 56 L 96 40 Z</string>
+    <string name="pause_icon_bottom_path_data">M 32 88 L 32 72 L 96 72 L 96 88 Z</string>
+
+    <!-- Groups -->
+    <string name="play_icon_group_top">upperpart</string>
+    <string name="play_icon_group_bottom">bottompart</string>
+    <string name="play_icon_group_parts">parts</string>
+
+    <!-- Path Name -->
+    <string name="play_icon_top_path_name">upper</string>
+    <string name="play_icon_bottom_path_name">bottom</string>
+
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 340ff8e701d2e25717dfc05723234404aa6afabb..9992d6110d5eebee25f39238e4d2e8a712cbcb6d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -426,6 +426,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Failed to deliver message.</string>
     <string name="MessageNotifier_error_delivering_message">Error delivering message.</string>
     <string name="MessageNotifier_mark_all_as_read">Mark all as read</string>
+    <string name="MessageNotifier_delete_all">Delete all</string>
     <string name="MessageNotifier_mark_read">Mark read</string>
     <string name="MessageNotifier_media_message">Media message</string>
     <string name="MessageNotifier_message_received">Message received by %s.</string>
diff --git a/src/org/smssecure/smssecure/notifications/DeleteMessageReceiver.java b/src/org/smssecure/smssecure/notifications/DeleteMessageReceiver.java
new file mode 100644
index 0000000000000000000000000000000000000000..eecca4d90893de6e7df98778039d12db836bfc71
--- /dev/null
+++ b/src/org/smssecure/smssecure/notifications/DeleteMessageReceiver.java
@@ -0,0 +1,60 @@
+package org.smssecure.smssecure.notifications;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.support.annotation.Nullable;
+import android.support.v4.app.NotificationManagerCompat;
+import android.util.Log;
+
+import org.smssecure.smssecure.crypto.MasterSecret;
+import org.smssecure.smssecure.database.DatabaseFactory;
+
+public class DeleteMessageReceiver extends MasterSecretBroadcastReceiver {
+
+  private static final String TAG                   = DeleteMessageReceiver.class.getSimpleName();
+  public static final  String DELETE_ACTION         = "org.smssecure.smssecure.notifications.DELETE_MSGS";
+  public static final  String MSG_IDS_EXTRA         = "msg_ids";
+  public static final  String MSG_IS_MMS_EXTRA      = "msg_is_mms";
+  public static final  String THREAD_IDS_EXTRA      = "thread_ids";
+  public static final  String NOTIFICATION_ID_EXTRA = "notification_id";
+
+  @Override
+  protected void onReceive(final Context context, Intent intent,
+                           @Nullable final MasterSecret masterSecret)
+  {
+    if (!DELETE_ACTION.equals(intent.getAction()))
+      return;
+
+    final long[]    messageIds   = intent.getLongArrayExtra(MSG_IDS_EXTRA);
+    final boolean[] messageIsMms = intent.getBooleanArrayExtra(MSG_IS_MMS_EXTRA);
+    final long[]    threadIds    = intent.getLongArrayExtra(THREAD_IDS_EXTRA);
+
+    if (messageIds == null || messageIsMms == null || threadIds == null ||
+            messageIds.length != messageIsMms.length){
+      Log.e(TAG, "Bad extras received");
+      return;
+    }
+
+    NotificationManagerCompat.from(context).cancel(intent.getIntExtra(NOTIFICATION_ID_EXTRA, -1));
+
+    new AsyncTask<Void, Void, Void>() {
+      @Override
+      protected Void doInBackground(Void... params) {
+        for (int i = 0; i < messageIds.length; i++) {
+          if (messageIsMms[i]) {
+            DatabaseFactory.getMmsDatabase(context).delete(messageIds[i]);
+          } else {
+            DatabaseFactory.getSmsDatabase(context).deleteMessage(messageIds[i]);
+          }
+        }
+        for (long threadId : threadIds) {
+          DatabaseFactory.getThreadDatabase(context).setRead(threadId);
+        }
+
+        MessageNotifier.updateNotification(context, masterSecret);
+        return null;
+      }
+    }.execute();
+  }
+}
diff --git a/src/org/smssecure/smssecure/notifications/MessageNotifier.java b/src/org/smssecure/smssecure/notifications/MessageNotifier.java
index df873880253d34cd017a4b32da1f7619647f3d70..14a2cf9b660d3bee125f1f8e3678abfd49593cbf 100644
--- a/src/org/smssecure/smssecure/notifications/MessageNotifier.java
+++ b/src/org/smssecure/smssecure/notifications/MessageNotifier.java
@@ -295,7 +295,8 @@ public class MessageNotifier {
     builder.addActions(masterSecret,
                        notificationState.getMarkAsReadIntent(context, notificationId),
                        notificationState.getQuickReplyIntent(context, notifications.get(0).getRecipients()),
-                       notificationState.getRemoteReplyIntent(context, notifications.get(0).getRecipients()));
+                       notificationState.getRemoteReplyIntent(context, notifications.get(0).getRecipients()),
+                       notificationState.getDeleteMessageIntent(context, notificationId));
 
     ListIterator<NotificationItem> iterator = notifications.listIterator(notifications.size());
 
@@ -333,7 +334,8 @@ public class MessageNotifier {
     long timestamp = notifications.get(0).getTimestamp();
     if (timestamp != 0) builder.setWhen(timestamp);
 
-    builder.addActions(notificationState.getMarkAsReadIntent(context, SUMMARY_NOTIFICATION_ID));
+    builder.addActions(notificationState.getMarkAsReadIntent(context, SUMMARY_NOTIFICATION_ID),
+                       notificationState.getDeleteMessageIntent(context, SUMMARY_NOTIFICATION_ID));
 
     ListIterator<NotificationItem> iterator = notifications.listIterator(0);
 
diff --git a/src/org/smssecure/smssecure/notifications/MultipleRecipientNotificationBuilder.java b/src/org/smssecure/smssecure/notifications/MultipleRecipientNotificationBuilder.java
index 721f796f32e423c2f4681ddfb0de0de0436def15..b7d757734477a74f6c7a9891ef01931adb378a8e 100644
--- a/src/org/smssecure/smssecure/notifications/MultipleRecipientNotificationBuilder.java
+++ b/src/org/smssecure/smssecure/notifications/MultipleRecipientNotificationBuilder.java
@@ -47,12 +47,17 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
     }
   }
 
-  public void addActions(PendingIntent markAsReadIntent) {
-    NotificationCompat.Action markAllAsReadAction = new NotificationCompat.Action(R.drawable.check,
+  public void addActions(PendingIntent markAsReadIntent, PendingIntent deleteAllIntent) {
+    NotificationCompat.Action markAllAsReadAction = new NotificationCompat.Action(R.drawable.ic_check_white_24dp,
                                             context.getString(R.string.MessageNotifier_mark_all_as_read),
                                             markAsReadIntent);
+    NotificationCompat.Action deleteAllAction = new NotificationCompat.Action(R.drawable.ic_delete_white_24dp,
+                                            context.getString(R.string.MessageNotifier_delete_all),
+                                            deleteAllIntent);
     addAction(markAllAsReadAction);
-    extend(new NotificationCompat.WearableExtender().addAction(markAllAsReadAction));
+    addAction(deleteAllAction);
+    extend(new NotificationCompat.WearableExtender().addAction(markAllAsReadAction)
+                                                    .addAction(deleteAllAction));
   }
 
   public void addMessageBody(@NonNull Recipient sender, @Nullable CharSequence body) {
diff --git a/src/org/smssecure/smssecure/notifications/NotificationState.java b/src/org/smssecure/smssecure/notifications/NotificationState.java
index e2c6b99acd688b7d23661472f1d810f20b19a4a2..d0b43bfc13c393b4ece00985d65b1a9a9f3dc9d9 100644
--- a/src/org/smssecure/smssecure/notifications/NotificationState.java
+++ b/src/org/smssecure/smssecure/notifications/NotificationState.java
@@ -102,7 +102,6 @@ public class NotificationState {
     int    index       = 0;
 
     for (long thread : threads) {
-      Log.w("NotificationState", "Added thread: " + thread);
       threadArray[index++] = thread;
     }
 
@@ -115,6 +114,33 @@ public class NotificationState {
     return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
   }
 
+  public PendingIntent getDeleteMessageIntent(Context context, int notificationId){
+
+    long[]    idArray     = new long[notificationCount];
+    boolean[] isMmsArray  = new boolean[notificationCount];
+    long[]    threadArray = new long[threads.size()];
+    int       index       = 0;
+
+    for (NotificationItem notificationItem : notifications) {
+      isMmsArray[index] = notificationItem.isMms();
+      idArray[index++]  = notificationItem.getId();
+    }
+    index = 0;
+    for (long thread : threads) {
+      threadArray[index++] = thread;
+    }
+
+    Intent intent = new Intent(DeleteMessageReceiver.DELETE_ACTION);
+    intent.setClass(context, DeleteMessageReceiver.class);
+    intent.setData((Uri.parse("custom://"+System.currentTimeMillis())));
+    intent.putExtra(DeleteMessageReceiver.MSG_IDS_EXTRA, idArray);
+    intent.putExtra(DeleteMessageReceiver.MSG_IS_MMS_EXTRA, isMmsArray);
+    intent.putExtra(DeleteMessageReceiver.THREAD_IDS_EXTRA, threadArray);
+    intent.putExtra(DeleteMessageReceiver.NOTIFICATION_ID_EXTRA, notificationId);
+
+    return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+  }
+
   public PendingIntent getRemoteReplyIntent(Context context, Recipients recipients) {
     if (threads.size() != 1) throw new AssertionError("We only support replies to single thread notifications!");
 
@@ -130,7 +156,7 @@ public class NotificationState {
   public PendingIntent getQuickReplyIntent(Context context, Recipients recipients) {
     if (threads.size() != 1) throw new AssertionError("We only support replies to single thread notifications! " + threads.size());
 
-    Intent     intent           = new Intent(context, ConversationPopupActivity.class);
+    Intent intent = new Intent(context, ConversationPopupActivity.class);
     intent.putExtra(ConversationActivity.RECIPIENTS_EXTRA, recipients.getIds());
     intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, (long)threads.toArray()[0]);
     intent.setData((Uri.parse("custom://"+System.currentTimeMillis())));
diff --git a/src/org/smssecure/smssecure/notifications/SingleRecipientNotificationBuilder.java b/src/org/smssecure/smssecure/notifications/SingleRecipientNotificationBuilder.java
index 8f4d0e0eacd5c339b7d6ab5841452133ffcbc9bd..4fda318fdf598864994e1b97f2903a9a5311e6ba 100644
--- a/src/org/smssecure/smssecure/notifications/SingleRecipientNotificationBuilder.java
+++ b/src/org/smssecure/smssecure/notifications/SingleRecipientNotificationBuilder.java
@@ -102,19 +102,23 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
   public void addActions(@Nullable MasterSecret masterSecret,
                          @NonNull PendingIntent markReadIntent,
                          @NonNull PendingIntent quickReplyIntent,
-                         @NonNull PendingIntent wearableReplyIntent)
+                         @NonNull PendingIntent wearableReplyIntent,
+                         @NonNull PendingIntent deleteIntent)
   {
-    Action markAsReadAction = new Action(R.drawable.check,
+    Action markAsReadAction = new Action(R.drawable.ic_check_white_24dp,
                                          context.getString(R.string.MessageNotifier_mark_read),
                                          markReadIntent);
+    Action deleteAction = new Action(R.drawable.ic_delete_white_24dp,
+                                     context.getString(R.string.delete),
+                                     deleteIntent);
 
     if (masterSecret != null) {
-      Action replyAction = new Action(R.drawable.ic_reply_white_36dp,
+      Action replyAction = new Action(R.drawable.ic_reply_white_24dp,
                                       context.getString(R.string.MessageNotifier_reply),
                                       quickReplyIntent);
 
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        replyAction = new Action.Builder(R.drawable.ic_reply_white_36dp,
+        replyAction = new Action.Builder(R.drawable.ic_reply_white_24dp,
                                          context.getString(R.string.MessageNotifier_reply),
                                          wearableReplyIntent)
             .addRemoteInput(new RemoteInput.Builder(MessageNotifier.EXTRA_REMOTE_REPLY)
@@ -131,13 +135,17 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
 
       addAction(markAsReadAction);
       addAction(replyAction);
+      addAction(deleteAction);
 
       extend(new NotificationCompat.WearableExtender().addAction(markAsReadAction)
-                                                      .addAction(wearableReplyAction));
+                                                      .addAction(wearableReplyAction)
+                                                      .addAction(deleteAction));
     } else {
       addAction(markAsReadAction);
+      addAction(deleteAction);
 
-      extend(new NotificationCompat.WearableExtender().addAction(markAsReadAction));
+      extend(new NotificationCompat.WearableExtender().addAction(markAsReadAction)
+                                                      .addAction(deleteAction));
     }
   }