diff --git a/config.php.in b/config.php.in
index bcabc37..3815632 100644
--- a/config.php.in
+++ b/config.php.in
@@ -160,6 +160,7 @@
 $config['ENABLE_STATISTICS'] = 1;
 $config['ENABLE_HISTORY'] = 1;
 $config['ENABLE_DELETE'] = 0;
+$config['AUTHORIZE_DELETE'] = 0;
 $config['ENABLE_REMOTE_IMAGES'] = '0';
 $config['ENABLE_ON_THE_FLY_VERIFICATION'] = 0;
 $config['ENABLE_LDAP_IMPORT_FEATURE'] = 0;
@@ -396,6 +397,7 @@
 define('TABLE_LEGAL_HOLD', 'legal_hold');
 define('TABLE_TIMESTAMP', 'timestamp');
 define('TABLE_PRIVATE', 'private');
+define('TABLE_DELETED', 'deleted');
 define('VIEW_MESSAGES', 'v_messages');
 
 define('EOL', "\n");
@@ -467,6 +469,7 @@
 define('ACTION_VIEW_JOURNAL', 17);
 define('ACTION_NOT_SPAM', 18);
 define('ACTION_MARK_AS_PRIVATE', 19);
+define('ACTION_MARK_MESSAGE_FOR_REMOVAL, 20);
 
 $actions = array(
                   'unknown' => 1,
diff --git a/util/db-mysql.sql b/util/db-mysql.sql
index b017808..5f6dd73 100644
--- a/util/db-mysql.sql
+++ b/util/db-mysql.sql
@@ -470,3 +470,13 @@
   primary key (`id`)
 ) Engine=InnoDB;
 
+
+create table if not exists `deleted` (
+  `id` bigint unsigned not null auto_increment,
+  `email` varchar(128) not null,
+  `reason` varchar(128) not null,
+  `date1` int unsigned not null,
+  `date2` int unsigned not null,
+  `deleted` tinyint(1) default 0,
+  primary key (`id`)
+) Engine=InnoDB;
diff --git a/webui/controller/customer/list.php b/webui/controller/customer/list.php
index bf900f0..ba33d16 100644
--- a/webui/controller/customer/list.php
+++ b/webui/controller/customer/list.php
@@ -131,5 +131,3 @@
 
 
 }
-
-?>
diff --git a/webui/controller/message/bulkremove.php b/webui/controller/message/bulkremove.php
index cac2da1..3af7571 100644
--- a/webui/controller/message/bulkremove.php
+++ b/webui/controller/message/bulkremove.php
@@ -21,6 +21,7 @@
       $this->document->title = $this->data['text_message'];
 
       if(!isset($this->request->post['idlist']) || $this->request->post['idlist'] == '') { die("no idlist parameter given"); }
+      if(!isset($this->request->post['reason']) || $this->request->post['reason'] == '') { die("no reason parameter given"); }
 
       $idlist = $this->model_search_search->check_your_permission_by_id_list(explode(",", $this->request->post['idlist']));
 
@@ -33,12 +34,16 @@
       }
 
       foreach($idlist as $id) {
+         $db->query("INSERT INTO " . TABLE_DELETED . " (id, email, reason, date1) VALUES(?,?,?,?)", [$id, $this->data['username'], $this->request->post['reason'], NOW]);
 
-         AUDIT(ACTION_REMOVE_MESSAGE, '', '', $id, '');
-
-         $db->query("UPDATE " . TABLE_META . " SET retained=? WHERE id=?", array(NOW, $id));
-
-         syslog(LOG_INFO, $this->data['username'] . " removed message: $id");
+         if(AUTHORIZE_DELETE) {
+            AUDIT(ACTION_MARK_MESSAGE_FOR_REMOVAL, '', '', $id, '');
+            syslog(LOG_INFO, $this->data['username'] . " marked message for removal: $id");
+         } else {
+            AUDIT(ACTION_REMOVE_MESSAGE, '', '', $id, '');
+            $db->query("UPDATE " . TABLE_META . " SET retained=? WHERE id=?", [NOW, $id]);
+            syslog(LOG_INFO, $this->data['username'] . " removed message: $id");
+         }
 
          $this->data['removed']++;
       }
@@ -48,5 +53,3 @@
 
 
 }
-
-?>
diff --git a/webui/language/cz/messages.php b/webui/language/cz/messages.php
index 521d7aa..7b162de 100644
--- a/webui/language/cz/messages.php
+++ b/webui/language/cz/messages.php
@@ -481,5 +481,4 @@
 
 $_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
 $_['text_private'] = "Private";
-
-?>
+$_['text_delete_reason'] = "Delete reason";
diff --git a/webui/language/de/messages.php b/webui/language/de/messages.php
index be7bf50..e8f20a7 100644
--- a/webui/language/de/messages.php
+++ b/webui/language/de/messages.php
@@ -488,4 +488,4 @@
 $_['text_folder_rules'] = "Verzeichnisregeln";
 $_['text_private'] = "Privat";
 
-?>
+$_['text_delete_reason'] = "Delete reason";
diff --git a/webui/language/en/messages.php b/webui/language/en/messages.php
index 1027b9c..f7ee37a 100644
--- a/webui/language/en/messages.php
+++ b/webui/language/en/messages.php
@@ -79,6 +79,7 @@
 $_['text_deferred_queue_sender'] = "deferred queue vs. sender";
 $_['text_delay'] = "Delay";
 $_['text_delete_confirm_message'] = "Do you wish to delete";
+$_['text_delete_reason'] = "Delete reason";
 $_['text_deleted_users'] = "deleted";
 $_['text_deliver'] = "Deliver";
 $_['text_delivered'] = "Delivered";
@@ -483,5 +484,3 @@
 $_['text_with_selected'] = 'With Selected';
 
 $_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
-
-?>
diff --git a/webui/language/es/messages.php b/webui/language/es/messages.php
index fc34f7a..fe6717f 100644
--- a/webui/language/es/messages.php
+++ b/webui/language/es/messages.php
@@ -486,5 +486,4 @@
 $_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
 $_['text_folder_rules'] = "Folder rules";
 $_['text_private'] = "Private";
-
-?>
+$_['text_delete_reason'] = "Delete reason";
diff --git a/webui/language/fr/messages.php b/webui/language/fr/messages.php
index 31821ed..53a35f6 100644
--- a/webui/language/fr/messages.php
+++ b/webui/language/fr/messages.php
@@ -483,5 +483,4 @@
 $_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
 $_['text_folder_rules'] = "Folder rules";
 $_['text_private'] = "Private";
-
-?>
+$_['text_delete_reason'] = "Delete reason";
diff --git a/webui/language/hu/messages.iso-8859-2.php b/webui/language/hu/messages.iso-8859-2.php
deleted file mode 100644
index 35fc8bd..0000000
--- a/webui/language/hu/messages.iso-8859-2.php
+++ /dev/null
@@ -1,489 +0,0 @@
-<?php
-
-$_['text_60_minutes'] = "60 perc";
-
-$_['text_action'] = "M�velet";
-$_['text_active_incoming_queue'] = "akt�v + bej�v� �zenetsor";
-$_['text_active_incoming_queue_sender'] = "akt�v + bej�v� �zenetsor (felad� szerint)";
-$_['text_ad_sync_status'] = "AD szinkroniz�ci� st�tusz";
-$_['text_add'] = "Felvesz";
-$_['text_add_new_email_address'] = "�j email c�m";
-$_['text_add_new_entry'] = "�j bejegyz�s";
-$_['text_add_new_domain'] = "�j domain";
-$_['text_add_new_group'] = "�j csoport";
-$_['text_add_new_rule'] = "�j szab�ly";
-$_['text_add_new_user_alias'] = "�j felhaszn�l�";
-$_['text_add_policy'] = "�j h�zirend";
-$_['text_administration'] = "Adminisztr�ci�";
-$_['text_admin_user'] = "Admin felhaszn�l�";
-$_['text_advanced'] = "�sszetett";
-$_['text_advanced_search'] = "�sszetett keres�s";
-$_['text_all'] = "�sszes";
-$_['text_any'] = "mindegy";
-$_['text_applied'] = "Alkalmazva";
-$_['text_apply_changes'] = "Be�ll�t�sok alkalmaz�sa";
-$_['text_archive_size'] = "Arch�vum m�ret";
-$_['text_archive_size_before_compression'] = "Arch�vum m�ret t�m�r�t�s n�lk�l";
-$_['text_archived_messages'] = "Archiv�lt levelek";
-$_['text_archiving_rules'] = "Archiv�l�si szab�lyok";
-$_['text_assigned_email_addresses'] = "Extra email c�mek";
-$_['text_attachment'] = "Mell�klet";
-$_['text_attachment_name'] = "Mell�klet n�v";
-$_['text_attachment_size'] = "Mell�klet m�ret";
-$_['text_attachment_type'] = "Mell�klet t�pus";
-$_['text_audit'] = "Audit";
-$_['text_automated_search'] = "Automatikus keres�s";
-
-$_['text_back'] = "Vissza";
-$_['text_background_colour'] = "H�tt�rsz�n";
-$_['text_branding_logo'] = "Brand logo";
-$_['text_branding_text'] = "Brand sz�veg";
-$_['text_branding_url'] = "Brand URL";
-$_['text_body'] = "Sz�veg";
-$_['text_bulk_edit_selected_uids'] = "Kiv�lasztott azonos�t�k szerkeszt�se";
-$_['text_bulk_restore_selected_emails'] = "Kiv�lasztott levelek vissza�ll�t�sa";
-$_['text_bulk_update_selected_uids'] = "Kiv�lasztott azonos�t�k szerkeszt�se";
-
-$_['text_cancel'] = "M�gse";
-$_['text_change_user_settings'] = "be�ll�t�sok ment�se";
-$_['text_clienthost'] = "Kliens g�p";
-$_['text_close'] = "Bez�r";
-$_['text_colour'] = "Sz�n";
-$_['text_compressed'] = "t�m�r�tett";
-$_['text_confirm_to_reset_counters'] = "Sz�ml�l�k null�z�s�nak meger�s�t�se";
-$_['text_connection_failed'] = "Sikertelen kapcsolat";
-$_['text_connection_ok'] = "Sikeres kapcsolat";
-$_['text_contact_support'] = "Seg�t�g";
-$_['text_content_filter'] = "Tartalomsz�r�";
-$_['text_conversation_available'] = "Lev�lv�lt�s el�rhet�";
-$_['text_copied'] = "�tm�solva";
-$_['text_counters'] = "Sz�ml�l�k";
-$_['text_cpu_load'] = "CPU terhel�s";
-$_['text_cpu_usage'] = "CPU haszn�lat";
-$_['text_create_new_secret'] = "�j k�d";
-$_['text_cumulative_counts'] = "�sszes�tett sz�ml�l�k";
-$_['text_customers'] = "�gyfelek";
-
-$_['text_daily_quarantine_report'] = "Napi karant�n riport";
-$_['text_daily_quarantine_report_status'] = "Napi karant�n �rtes�t�s";
-$_['text_daily_report'] = "Napi jelent�s";
-$_['text_daily_piler_report'] = "Napi piler jelent�s";
-$_['text_database_emails'] = "email c�m a piler adatb�zisban";
-$_['text_date'] = "D�tum";
-$_['text_date_from'] = "D�tumt�l";
-$_['text_date_to'] = "D�tumig";
-$_['text_days'] = "Napok";
-$_['text_days2'] = "nap";
-$_['text_days_to_retain'] = "Meg�rz�si id� (nap)";
-$_['text_deferred_queue'] = "k�s�bbi kik�ld�sre v�r� �zenetsor";
-$_['text_deferred_queue_sender'] = "k�s�bbi kik�ld�sre v�r� �zenetsor (felad� szerint)";
-$_['text_delay'] = "K�sleltet�s";
-$_['text_delete_confirm_message'] = "T�r�lni akarja";
-$_['text_deleted_users'] = "t�r�lt";
-$_['text_deliver'] = "K�zbes�t�s";
-$_['text_delivered'] = "K�zbes�tett";
-$_['text_deliver_and_train_selected_messages'] = "Kiv�lasztott �zenetek tan�t�sa �s k�zbes�t�se";
-$_['text_deliver_and_train_selected_messages_as_ham'] = "Kiv�lasztott �zenetek tan�t�sa J� LEV�LK�NT, �s k�zbes�t�se";
-$_['text_deliver_selected_messages'] = "Kiv�lasztott �zenetek k�zbes�t�se";
-$_['text_description'] = "Le�r�s";
-$_['text_direction'] = "Ir�ny";
-$_['text_disable'] = "Letilt";
-$_['text_disabled'] = "letiltva";
-$_['text_disk_usage'] = "Diszk haszn�lat";
-$_['text_dn_asterisk_means_skip_sync'] = "A csillag (*) azt jelenti, hogy ez a felhaszn�l� nem r�sze az AD szerverr�l szinkroniz�l�snak";
-$_['text_domain'] = "Domain";
-$_['text_domains'] = "Domain(ek)";
-$_['text_domainname'] = "Domainn�v";
-$_['text_download_all_hits_as_eml'] = "�sszes tal�lat let�lt�se (EML)";
-$_['text_download_selected_hits_as_pdf'] = "�sszes tal�lat let�lt�se (PDF)";
-$_['text_download_attachment2'] = "mell�klet let�lt�s";
-$_['text_download_message'] = "Lev�l let�lt�se (EML)";
-$_['text_download_message2'] = "lev�l let�lt�se";
-
-$_['text_edit'] = "Szerkeszt";
-$_['text_edit_entry'] = "Bejegyz�s szerkeszt�se";
-$_['text_edit_group'] = "Csoport szerkeszt�se";
-$_['text_edit_user'] = "Felhaszn�l� szerkeszt�se";
-$_['text_edit_or_view'] = "Szerkeszt/Megn�z";
-$_['text_email'] = "Email c�m";
-$_['text_email_addresses'] = "Email c�mek";
-$_['text_email_aliases'] = "Email �lc�mek";
-$_['text_email_in_unknown_domain'] = "Az email c�m ismeretlen domainben van";
-$_['text_empty_search_criteria'] = "'�res felt�tel'";
-$_['text_empty_search_result'] = "Nincs tal�lat a keres�sre. Pr�b�ljon meg csillagot (*) tenni a sz�t�red�k (min. " . MIN_PREFIX_LEN . " karakter) ut�n, pl. titkos*, hogy megtal�lja a \"titkos�t�s\", \"titkos�tott\", stb. szavakat tartalmaz� leveleket.";
-$_['text_enable'] = "Enged�lyez";
-$_['text_enabled'] = "enged�lyezve";
-$_['text_enter_google_authenticator_code'] = "Adja meg a Google Authenticator k�dot";
-
-$_['text_enter_one_email_address_per_line'] = "Egy sorba egy email c�met �rjon";
-$_['text_enter_one_group_per_line'] = "Egy sorba egy csoportnevet �rjon";
-$_['text_enter_search_terms'] = "�rja be a keres�si felt�teleket";
-$_['text_error'] = "Hiba";
-$_['text_exact_domain_name_or_email_address'] = "pontos domainn�v vagy email c�m";
-$_['text_exclude'] = "Kihagy";
-$_['text_existing'] = "L�tez�";
-$_['text_existing_domains'] = "L�tez� domainek";
-$_['text_existing_email'] = "L�tez� email";
-$_['text_existing_entries'] = "Jelenlegi bejegyz�sek";
-$_['text_existing_groups'] = "L�tez� mapp�k";
-$_['text_existing_groups'] = "L�tez� csoportok";
-$_['text_existing_policies'] = "L�tez� h�zirendek";
-$_['text_existing_rules'] = "L�tez� szab�lyok";
-$_['text_existing_user'] = "L�tez� felhaszn�l�";
-$_['text_existing_users'] = "L�tez� felhaszn�l�k";
-$_['text_expert'] = "Halad�";
-$_['text_expert_search'] = "Halad� keres�s";
-
-$_['text_failed'] = "sikertelen";
-$_['text_failed_to_add'] = "Hiba a hozz�ad�s sor�n";
-$_['text_failed_to_change_password'] = "Nem siker�lt jelsz�t v�ltani";
-$_['text_failed_to_deliver'] = "Nem siker�lt k�zbes�teni";
-$_['text_failed_to_mark_for_removal'] = "Nem siker�lt t�rl�sre jel�lni";
-$_['text_failed_to_modify'] = "Nem siker�lt m�dos�tani";
-$_['text_failed_to_remove'] = "Hiba az elt�vol�t�skor";
-$_['text_failed_to_restore'] = "Hiba a vissza�ll�t�s sor�n";
-$_['text_failed_to_update'] = "Nem siker�lt m�dos�tani";
-$_['text_first'] = "Els�";
-$_['text_folder'] = "Mappa";
-$_['text_folder_rules'] = "Mappa szab�lyok";
-$_['text_folders'] = "Mapp�k";
-$_['text_forward_selected_emails_to'] = "Kijel�lt levelek tov�bb�t�sa";
-$_['text_from'] = "Felad�";
-$_['text_from_domain'] = "Felad� domain";
-
-$_['text_health'] = "Rendszer�llapot";
-$_['text_health_monitor'] = "Rendszer�llapot";
-$_['text_help'] = "Seg�ts�g";
-$_['text_history'] = "T�rt�net";
-$_['text_home'] = "Kezd�lap";
-
-$_['text_google_authenticator_code'] = "Google Authenticator k�d";
-$_['text_google_authenticator_settings'] = "Google Authenticator be�ll�t�sok";
-$_['text_group_id'] = "Csoport azonos�t�";
-$_['text_groupname'] = "Csoportn�v";
-$_['text_groups'] = "Csoportok";
-$_['text_group_management'] = "Csoportok";
-$_['text_group_membership'] = "Csoport tags�g";
-
-$_['text_image'] = "k�p";
-$_['text_import'] = "Import";
-$_['text_import_job_delete_confirm_message'] = "T�r�lni akarja ezt az import job-ot?";
-$_['text_import_users'] = "Felhaszn�l�k import�l�sa";
-$_['text_import_users_from_LDAP'] = "Felhaszn�l�k import�l�sa LDAP-b�l";
-$_['text_inbound'] = "bej�v�";
-$_['text_indexer_job'] = "Indexer fut�s";
-$_['text_install_sudo_apply'] = "Adja az al�bbi sort a /etc/sudoers file-hoz: 'www-data ALL=NOPASSWD: /etc/init.d/rc.piler reload'";
-$_['text_internal'] = "bels�";
-$_['text_invalid_data'] = "�rv�nytelen adat(ok)";
-$_['text_invalid_email'] = "�rv�nytelen email c�m";
-$_['text_invalid_email_or_password'] = "�rv�nytelen email c�m vagy jelsz�";
-$_['text_invalid_gid'] = "�rv�nytelen csoportazonos�t�";
-$_['text_invalid_password'] = "�rv�nytelen jelsz�";
-$_['text_invalid_pin_code'] = "�rv�nytelen pin k�d";
-$_['text_invalid_policy_group'] = "�rv�nytelen h�zirend szonos�t�";
-$_['text_invalid_policy_name'] = "�rv�nytelen h�zirend n�v";
-$_['text_invalid_policy_setting'] = "�rv�nytelen be�ll�t�s(ok)";
-$_['text_invalid_uid'] = "�rv�nytelen felhaszn�l�azonos�t�";
-$_['text_invalid_username'] = "�rv�nytelen felhaszn�l�n�v";
-$_['text_ipaddr'] = "IP c�m";
-
-$_['text_language'] = "Nyelv";
-$_['text_last'] = "Utols�";
-$_['text_last_activity'] = "Utols� aktivit�s";
-$_['text_latest_emails'] = "Legfrissebb emailek";
-$_['text_last_update'] = "Utols� friss�t�s";
-$_['text_ldap'] = "LDAP";
-$_['text_ldap_auditor_member_dn'] = "Auditor DN";
-$_['text_ldap_base_dn'] = "LDAP alap�rtelmezett DN";
-$_['text_ldap_bind_dn'] = "LDAP csatlakoz�si DN";
-$_['text_ldap_bind_pw'] = "LDAP csatlakoz�si jelsz�";
-$_['text_ldap_host'] = "LDAP kiszolg�l�";
-$_['text_ldap_type'] = "LDAP t�pus";
-$_['text_legal_hold'] = "Legal hold";
-$_['text_load'] = "Bet�lt�s";
-$_['text_loading'] = "t�lt�dik";
-$_['text_logged_in'] = "Bejelentkez�s";
-$_['text_logged_out'] = "�n kijelentkezett";
-$_['text_login'] = "Bejelentkez�s";
-$_['text_login2'] = "bejelentkez�s";
-$_['text_login_failed'] = "sikertelen bejelentkez�s";
-$_['text_login_via_google'] = "Bejelentkez�s Google fi�kkal";
-$_['text_logout'] = "Kijelentkez�s";
-$_['text_logout2'] = "kijelentkez�s";
-
-$_['text_maillog_status'] = "maillog gy�jt� st�tusz";
-$_['text_main_title'] = "clapf web UI";
-$_['text_mapped_domain'] = "Hozz�rendelt domain";
-$_['text_marked_for_removal'] = "Lev�l t�rl�sre jel�lve";
-$_['text_memory_usage'] = "Mem�ria haszn�lat";
-$_['text_message'] = "�zenet";
-$_['text_messages'] = "�zenet";
-$_['text_message_disposition'] = "�zenet t�pusok";
-$_['text_message_text'] = "Lev�l sz�veg";
-$_['text_min_2_chars'] = "Min. 2 karakter";
-$_['text_missing_data'] = "Hi�nyz� adat";
-$_['text_missing_password'] = "Hi�nyz� jelsz�";
-$_['text_modify'] = "M�dos�t�s";
-$_['text_monitor'] = "Monitor";
-$_['text_months'] = "h�nap";
-$_['text_monthly_report'] = "Havi jelent�s";
-
-$_['text_new'] = "�j";
-$_['text_new_users'] = "�j";
-$_['text_next'] = "K�vetkez�";
-$_['text_no_domain_found'] = 'Nem tal�ltam domaineket';
-$_['text_no_email_found'] = 'Nem tal�ltam emaileket';
-$_['text_no_message_in_the_quarantine'] = "Nincs a keres�si felt�telnek megfelel� �zenet a karant�nban";
-$_['text_no_records'] = "nincs tal�lat";
-$_['text_no_sender'] = "nincs felad�";
-$_['text_no_spam_message_in_the_quarantine_yet'] = "Nincs spam a karant�nban";
-$_['text_no_subject'] = "nincs t�rgy";
-$_['text_no_such_policy'] = "Nincs ilyen h�zirend";
-$_['text_non_existent_queue_directory'] = "A megadott queue k�nyvt�r nem l�tezik";
-$_['text_non_existing_user'] = "Nem l�tez� felhaszn�l�";
-$_['text_notes'] = "Megjegyz�sek";
-$_['text_not_found'] = "Nincs tal�lat";
-$_['text_not_running'] = "nem fut";
-$_['text_not_spam'] = "nem spam";
-$_['title_not_found'] = "Az oldal nem tal�lhat�";
-$_['text_number_of_messages_in_quarantine'] = "A keres�si felt�telnek megfelel� �zenetek sz�ma a karant�nban";
-$_['text_number_of_spam_messages_in_quarantine'] = "A keres�si felt�telnek megfelel� spam �zenetek sz�ma a karant�nban";
-
-$_['text_off'] = "ki";
-$_['text_on'] = "be";
-$_['text_online_users'] = "Online felhaszn�l�k";
-$_['text_other'] = "egy�b";
-$_['text_outbound'] = "kimen�";
-
-$_['text_password'] = "Jelsz�";
-$_['text_password_again'] = "Jelsz� ism�t";
-$_['text_password_changed'] = "Jelsz� megv�ltozott";
-$_['text_password_mismatch'] = "A k�t jelsz� nem egyezik meg";
-$_['text_page_length'] = "Oldalank�nti tal�latok sz�ma";
-$_['text_periodic_purge'] = "Peri�dikus lev�lt�rl�s";
-$_['text_policy'] = "H�zirend";
-$_['text_policy_group'] = "H�zirend azonos�t�";
-$_['text_policy_name'] = "H�zirend neve";
-$_['text_previous'] = "El�z�";
-$_['text_print_message'] = "Nyomtat�s";
-$_['text_private'] = "Priv�t";
-$_['text_processed_emails'] = "Feldolgozott levelek";
-$_['text_progress'] = "St�tusz";
-$_['text_purge_all_messages_from_quarantine'] = "�sszes saj�t �zenet t�rl�se a karant�nb�l";
-$_['text_purge_selected_messages'] = "Kiv�lasztott �zenetek elt�vol�t�sa";
-$_['text_purged'] = "Elt�vol�tva";
-
-$_['text_qr_code'] = "QR";
-$_['text_queue_status'] = "Queue st�tusz";
-$_['text_quick_search'] = "Gyorskeres�s";
-
-$_['text_realname'] = "N�v";
-$_['text_recipient'] = "C�mzett";
-$_['text_ref'] = "Hivatkoz�s";
-$_['text_refresh_period'] = "Friss�t�si peri�dus";
-$_['text_refresh_qr_code'] = "QR k�d friss�t�se";
-$_['text_relay_details'] = "Relay r�szletek";
-$_['text_relay_status'] = "Relay st�tusz";
-$_['text_remove'] = "T�rl�s";
-$_['text_remove_domain'] = "Domain t�rl�se";
-$_['text_remove_message'] = "Lev�l t�rl�se";
-$_['text_remove_message2'] = "lev�l t�rl�se";
-$_['text_remove_selected_uids'] = "Kijel�lt azonos�t�k t�rl�se";
-$_['text_remove_policy'] = "H�zirend t�rl�se";
-$_['text_remove_rule'] = "Szab�ly t�rl�se";
-$_['text_remove_this_group'] = "Csoport t�rl�se";
-$_['text_remove_this_policy'] = "H�zirend t�rl�se";
-$_['text_remove_this_user'] = "Felhaszn�l� t�rl�se";
-$_['text_removed'] = "T�r�lve";
-$_['text_reset_counters'] = "Sz�ml�l�k null�z�sa";
-$_['text_restore'] = "Vissza�ll�t";
-$_['text_restored'] = "Vissza�ll�tva";
-$_['text_restore_message'] = "lev�l vissza�ll�t�sa";
-$_['text_restore_to_mailbox'] = "Lev�l vissza�ll�t�sa postafi�kba";
-$_['text_restored'] = "Vissza�ll�tva";
-$_['text_result'] = "Eredm�ny";
-$_['text_retention_days'] = "Megtart�si id� [nap]";
-$_['text_retention_rules'] = "Megtart�si szab�lyok";
-$_['text_role'] = "Felhaszn�l�t�pus";
-$_['text_running'] = "fut";
-
-$_['text_save'] = "Ment�s";
-$_['text_saved'] = "Elmentve";
-$_['text_save_search'] = "keres�s ment�se";
-$_['text_save_search_terms'] = "Keres�si felt�tel ment�se";
-$_['text_saved_search_terms'] = "Elmentett keres�sek";
-$_['text_search'] = "Keres�s";
-$_['text_search2'] = "keres�s";
-$_['text_search_emails'] = "Email c�mek keres�se";
-$_['text_search_email_to_add'] = "�rja be az email c�m elej�t";
-$_['text_search_expression'] = "Keres�si kifejez�s";
-$_['text_search_folders'] = "Mapp�k keres�se";
-$_['text_search_folder_to_add'] = "�rja be a mappa elej�t";
-$_['text_search_groups'] = "Csoportok keres�se";
-$_['text_search_group_to_add'] = "�rja be a csoport nev�nek elej�t";
-$_['text_search_terms'] = "Keres�si felt�telek";
-$_['text_select_action'] = "M�velet v�laszt�s";
-$_['text_select_all'] = "Mindegyik kijel�l�se";
-$_['text_select_image'] = "V�lasszon k�pet";
-$_['text_select_recipients'] = "C�mzettek kijel�l�se";
-$_['text_sender'] = "Felad�";
-$_['text_sending_domains'] = "k�ld� domain";
-$_['text_server_name'] = "Szerver n�v";
-$_['text_server_operating_system'] = "Oper�ci�s rendszer";
-$_['text_set'] = "Be�ll�t";
-$_['text_settings'] = "Be�ll�t�sok";
-$_['text_simple'] = "Egyszer�";
-$_['text_simple_search'] = "Egyszer� keres�s";
-$_['text_size'] = "M�ret";
-$_['text_smtp_status'] = "SMTP st�tusz";
-$_['text_spam'] = "Spam";
-$_['text_spam2'] = "spam";
-$_['text_statistics'] = "Statisztika";
-$_['text_status'] = "St�tusz";
-$_['text_storage'] = "T�rol�";
-$_['text_subject'] = "T�rgy";
-$_['text_submit'] = "Mehet";
-$_['text_successful'] = "Sikeres";
-$_['text_successfully_added'] = "Sikeresen felv�ve";
-$_['text_successfully_delivered'] = "Sikeresen k�zbes�tve";
-$_['text_successfully_modified'] = "Sikeresen m�dos�tva";
-$_['text_successfully_removed'] = "Sikeresen elt�vol�tva";
-$_['text_successfully_trained'] = "Sikeresen tan�tva";
-$_['text_successfully_updated'] = "Sikeresen m�dos�tva";
-$_['text_support_link'] = "T�mogat�s link";
-$_['text_swap_usage'] = "Swap haszn�lat";
-
-$_['text_tag_selected_messages'] = "Kijel�lt �zenetek c�mk�z�se";
-$_['text_tagged'] = "C�mk�zve";
-$_['text_tags'] = "C�mk�k";
-$_['text_test_connection'] = "Kapcsolat tesztel�se";
-$_['text_text'] = "Sz�veg";
-$_['text_text_colour'] = "Sz�vegsz�n";
-$_['text_text2'] = "sz�veg";
-$_['text_theme'] = "St�lus";
-$_['text_time'] = "Id�pont";
-$_['text_to'] = "C�mzett";
-$_['text_to_domain'] = "C�mzett domain";
-$_['text_too_short_password'] = "T�l r�vid jelsz�";
-$_['text_total'] = "�sszes";
-$_['text_total_ratio'] = "�sszes ar�ny";
-$_['text_total_query_time'] = "SQL lek�rdez�sek �sszideje";
-$_['text_total_users'] = "�sszes";
-$_['text_type'] = "T�pus";
-
-$_['text_uids'] = "Felhaszn�l� azonos�t�k";
-$_['text_unknown'] = "ismeretlen";
-$_['text_unauthorized_domain'] = "Nem megengedett domain";
-$_['text_unauthorized_download_attachment'] = "jogosulatlan mell�klet let�lt�s";
-$_['text_unauthorized_remove_message'] = "jogosulatlan �zenet t�rl�s";
-$_['text_unauthorized_view_message'] = "jogosulatlan �zenet megtekint�s";
-$_['text_update_retention_within_this_domain'] = "Megtart�si id� friss�t�se ebben a domainben";
-$_['text_update_selected_uids'] = "Kijel�lt azonos�t�k m�dos�t�sa";
-$_['text_updated_records'] = "Friss�tett rekordok";
-$_['text_uptime'] = "Uptime";
-$_['text_user'] = "Felhaszn�l�";
-$_['text_users'] = "Felhaszn�l�k";
-$_['text_user_id'] = "Felhaszn�l� azonos�t�";
-$_['text_user_auditor'] = "Auditor";
-$_['text_user_domainadmin'] = "Domain admin";
-$_['text_user_management'] = "Felhaszn�l�k";
-$_['text_user_masteradmin'] = "Mester admin";
-$_['text_user_read_only_admin'] = "Read-only admin";
-$_['text_user_regular'] = "Sima felhaszn�l�";
-$_['text_userlist'] = "Felhaszn�l�k list�ja";
-$_['text_username'] = "Felhaszn�l�n�v";
-$_['text_users_quarantine'] = "Felhaszn�l�k karant�nja";
-
-$_['text_view_formatted_email'] = "Form�zott lev�l megtekint�se";
-$_['text_view_header'] = "fejl�c megtekint�se";
-$_['text_view_headers'] = "Lev�l fejl�ce";
-$_['text_view_journal'] = "journal";
-$_['text_view_journal_envelope'] = "Journal envelope";
-$_['text_view_message'] = "Lev�l megtekint�se";
-$_['text_view_message2'] = "lev�l megtekint�se";
-$_['text_view_progress'] = "folyamatban l�v� import�l�sok";
-$_['text_view_raw_email'] = "Form�zatlan lev�l megtekint�se";
-$_['text_view_user_quarantine'] = "Felhaszn�l� karant�n megtekint�se";
-
-$_['text_warning_about_default_policy'] = "Az alap�rtelmezett h�zirend a clapf.conf f�jlban van";
-$_['text_whitelist'] = "Feh�rlista";
-$_['text_whitelist_settings'] = "Feh�rlista be�ll�t�sok";
-$_['text_with_attachment'] = "mell�kletekkel";
-$_['text_without_attachment'] = "mell�kletek n�lk�l";
-
-$_['text_years'] = "�v";
-$_['text_you_are'] = "�n";
-$_['text_you_are_not_admin'] = "�nnek nincs jogosults�ga a m�velethez";
-
-
-$_['rcvd'] = "fogadott lev�l";
-$_['virus'] = "v�rusos lev�l";
-$_['duplicate'] = "duplik�lt lev�l";
-$_['ignore'] = "ignor�lt lev�l";
-$_['counters_last_update'] = "sz�ml�l�k friss�tve";
-
-$_['text_24_hours'] = "24 �ra";
-$_['text_1_week'] = "1 h�t";
-$_['text_30_days'] = "30 nap";
-
-$_['text_access_settings'] = 'Hozz�f�r�sek';
-$_['text_access_setting_explanation'] = "A saj�t email c�meihez mindig hozz�f�rhet. Az egyes domainekhez ill. csoportokhoz val� auditor hozz�f�r�s�rt, k�rj�k l�pjen kapcsolatba az arch�vum adminisztr�torokkal.";
-$_['text_display_settings'] = 'Megjelen�t�s';
-$_['text_change_password'] = "Jelsz� m�dos�t�s";
-$_['text_none_found'] = "Nincs";
-$_['text_primary_domain'] = "Els�dleges Domain";
-$_['text_search_domains'] = "Domainek keres�se";
-$_['text_search_domain_to_add'] = "�rja be a domain nev�nek elej�t";
-
-$_['text_space_projection'] = 'T�rter�let el�rejelz�s';
-$_['text_average_messages_day'] = 'Levelek sz�m�nak napi �tlaga';
-$_['text_average_message_size'] = '�tlagos lev�lm�ret + Meta adatok + Index m�ret';
-$_['text_average_size_day'] = 'Napi �tlag m�ret';
-$_['text_partition_full'] = 'part�ci� betel�s�ig h�tralev� id�';
-$_['text_usage_trend'] = 'Kihaszn�lts�g trend';
-$_['text_usage_increasing'] = 'n�';
-$_['text_usage_decreasing'] = 'cs�kken';
-$_['text_usage_neutral'] = 'nem v�ltozik';
-$_['text_accounting'] = 'Arch�vum statisztika';
-$_['text_accounting_email'] = 'Email szerint';
-$_['text_accounting_domain'] = 'Domain szerint';
-
-$_['text_options'] = 'Opci�k';
-$_['text_spam_flag'] = 'SPAM lev�l';
-$_['text_attachment_flag'] = 'Mell�klet';
-$_['text_notes_flag'] = 'Megjegyz�s';
-$_['text_tag_flag'] = 'C�mke';
-$_['text_verified_flag'] = 'Ellen�rz�tt';
-$_['text_unverified_flag'] = 'M�dos�tott lev�l';
-$_['text_bulk_download'] = 'Kiv�lasztott levelek let�lt�se';
-$_['text_clear'] = 'T�rl�s';
-$_['text_select_letter'] = 'C�m kiv�laszt�sa bet� szerint';
-$_['text_working'] = 'Keres�s...';
-
-$_['text_use_browser_settings'] = 'B�ng�sz� be�ll�t�sainak haszn�lata';
-
-$_['text_sent'] = 'K�ld�tt';
-$_['text_received'] = 'Fogadott';
-$_['text_oldest_record'] = 'Legr�gebbi rekord';
-$_['text_newest_record'] = 'Leg�jabb rekord';
-$_['text_items'] = 'T�telek';
-$_['text_average_size'] = '�tlag m�ret';
-
-$_['text_return_to'] = 'Vissza';
-$_['text_error_message'] = 'K�rj�k, jav�tsa ki az al�bbi hib�kat, �s k�ldje el �jra a formot.';
-$_['text_field_required'] = 'K�telez� mez�.';
-$_['text_field_length'] = 'Ennek a mez�nek hosszabbnak kell lennie ? karaktern�l.';
-$_['text_field_domain'] = 'Ennek a mez�nek �rv�nyes domainn�vnek kell lennie (pl. - domain.com).';
-$_['text_field_colour'] = 'Ennek a mez�nek �rv�nyes sz�nk�dnak kell lennie (pl. - #fcfcfc).';
-$_['text_delete'] = 'T�rl�s';
-$_['text_confirm'] = 'Meger�s�t�s';
-$_['text_user_delete_confirm_message'] = 'T�r�lni akarja a felhaszn�l�t';
-$_['text_domain_delete_confirm_message'] = 'T�r�lni akarja a domaint';
-$_['text_group_delete_confirm_message'] = 'T�r�lni akarja a csoportot';
-$_['text_ldap_delete_confirm_message'] = 'T�r�lni akarja az LDAP bejegyz�st';
-$_['text_customer_delete_confirm_message'] = 'T�r�lni akarja az �gyfelet';
-$_['text_with_selected'] = 'Kiv�lasztott levelek';
-
-$_['text_compliance_warning'] = 'A t�rl�s funkci� enged�lyezett, ez�rt az arch�vum NEM teljes�ti a megfelel�s�get!';
-
-?>
diff --git a/webui/language/hu/messages.php b/webui/language/hu/messages.php
index 78b938d..4a33f47 100644
--- a/webui/language/hu/messages.php
+++ b/webui/language/hu/messages.php
@@ -79,6 +79,7 @@
 $_['text_deferred_queue_sender'] = "későbbi kiküldésre váró üzenetsor (feladó szerint)";
 $_['text_delay'] = "Késleltetés";
 $_['text_delete_confirm_message'] = "Törölni akarja";
+$_['text_delete_reason'] = "Törlés oka";
 $_['text_deleted_users'] = "törölt";
 $_['text_deliver'] = "Kézbesítés";
 $_['text_delivered'] = "Kézbesített";
@@ -485,5 +486,3 @@
 $_['text_with_selected'] = 'Kiválasztott levelek';
 
 $_['text_compliance_warning'] = 'A törlés funkció engedélyezett, ezért az archívum NEM teljesíti a megfelelőséget!';
-
-?>
diff --git a/webui/language/pl/messages.php b/webui/language/pl/messages.php
index 150633a..d75ba6a 100644
--- a/webui/language/pl/messages.php
+++ b/webui/language/pl/messages.php
@@ -483,5 +483,4 @@
 $_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
 $_['text_folder_rules'] = "Folder rules";
 $_['text_private'] = "Private";
-
-?>
+$_['text_delete_reason'] = "Delete reason";
diff --git a/webui/language/pt/messages.php b/webui/language/pt/messages.php
index c37a0e9..6c4db8f 100644
--- a/webui/language/pt/messages.php
+++ b/webui/language/pt/messages.php
@@ -476,5 +476,4 @@
 $_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
 $_['text_folder_rules'] = "Folder rules";
 $_['text_private'] = "Private";
-
-?>
+$_['text_delete_reason'] = "Delete reason";
diff --git a/webui/language/ru/messages.php b/webui/language/ru/messages.php
index d0490a7..cb3dec6 100644
--- a/webui/language/ru/messages.php
+++ b/webui/language/ru/messages.php
@@ -484,3 +484,4 @@
 $_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
 $_['text_folder_rules'] = "Folder rules";
 $_['text_private'] = "Private";
+$_['text_delete_reason'] = "Delete reason";
diff --git a/webui/language/tr/messages.php b/webui/language/tr/messages.php
index b931dbd..2e25c37 100644
--- a/webui/language/tr/messages.php
+++ b/webui/language/tr/messages.php
@@ -484,5 +484,4 @@
 $_['text_compliance_warning'] = 'The delete feature is enabled, therefore the archive is NOT compliant!';
 $_['text_folder_rules'] = "Folder rules";
 $_['text_private'] = "Private";
-
-?>
+$_['text_delete_reason'] = "Delete reason";
diff --git a/webui/model/search/search.php b/webui/model/search/search.php
index ec269fa..2796423 100644
--- a/webui/model/search/search.php
+++ b/webui/model/search/search.php
@@ -484,7 +484,8 @@
       $rcpt = $srcpt = array();
       $tag = array();
       $note = array();
-      $private = array();
+      $private = [];
+      $deleted = [];
       $q = '';
       global $SUPPRESS_RECIPIENTS;
 
@@ -516,12 +517,20 @@
 
       if(isset($query->rows)) {
 
-         $privates = $this->db->query("SELECT `id` FROM `" . TABLE_PRIVATE . "` WHERE id IN ($q)", $ids);
+         $s = $this->db->query("SELECT `id` FROM `" . TABLE_PRIVATE . "` WHERE id IN ($q)", $ids);
 
-         foreach ($privates->rows as $p) {
+         foreach ($s->rows as $p) {
             $private[$p['id']] = 1;
          }
 
+         if(ENABLE_DELETE) {
+            $s = $this->db->query("SELECT `id` FROM `" . TABLE_DELETED . "` WHERE id IN ($q)", $ids);
+
+            foreach ($s->rows as $p) {
+               $deleted[$p['id']] = 1;
+            }
+         }
+
          array_unshift($ids, (int)$session->get("uid"));
 
          $tags = $this->db->query("SELECT `id`, `tag` FROM `" . TABLE_TAG . "` WHERE `uid`=? AND `id` IN ($q)", $ids);
@@ -540,7 +549,8 @@
 
 
          foreach($query->rows as $m) {
-            if(ENABLE_DELETE == 1 && $m['retained'] < NOW) $m['deleted'] = 1; else $m['deleted'] = 0;
+            // We mark it as deleted even if it's only marked for removal
+            if(ENABLE_DELETE == 1 && ($m['retained'] < NOW || isset($deleted[$m['id']])) ) $m['deleted'] = 1; else $m['deleted'] = 0;
 
             $m['shortfrom'] = make_short_string($m['from'], MAX_CGI_FROM_SUBJ_LEN);
             $m['from'] = escape_gt_lt_quote_symbols($m['from']);
diff --git a/webui/view/javascript/piler-in.js b/webui/view/javascript/piler-in.js
index e7ba727..5b6d84b 100644
--- a/webui/view/javascript/piler-in.js
+++ b/webui/view/javascript/piler-in.js
@@ -17,6 +17,7 @@
     extra_folders: '',
     bulkrestore_url: '/bulkrestore.php',
     bulkpdf_url: '/bulkpdf.php',
+    text_successfully_removed: '<?php print $text_successfully_removed; ?>'
 
     /*
      * variables used at search listing
@@ -357,7 +358,14 @@
     },
 
 
-    bulk_remove_messages:function(msg)
+    show_bulk_remove_modal:function()
+    {
+        Piler.log("[show_bulk_remove_modal]");
+
+        $('#deletebox-modal').modal('show');
+    },
+
+    bulk_remove_messages:function(reason)
     {
         Piler.log("[bulk_remove_messages]");
 
@@ -368,13 +376,13 @@
         if(!idlist) return;
 
         jQuery.ajax('/bulkremove.php', {
-           data: { idlist: idlist },
+           data: { idlist: idlist, reason: reason },
            type: "POST"
         })
         .done( function( a ) {})
         .fail(function( a, b ) { alert("Problem retrieving XML data:" + b) });
 
-        Piler.show_message('messagebox1', msg, 0.8);
+        Piler.show_message('messagebox1', text_successfully_removed, 0.8);
     },
 
 
diff --git a/webui/view/theme/default/templates/common/layout-search.tpl b/webui/view/theme/default/templates/common/layout-search.tpl
index 2417696..ba5c7e3 100644
--- a/webui/view/theme/default/templates/common/layout-search.tpl
+++ b/webui/view/theme/default/templates/common/layout-search.tpl
@@ -51,6 +51,22 @@
   </div>
 </div>
 
+<?php if(Registry::get('auditor_user') == 1) { ?>
+<div id="deletebox-modal" class="modal hide fade">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" role="dialog" aria-hidden="true"><i class="icon-remove"></i></button>
+    <h3><?php print $text_delete_reason; ?></h3>
+  </div>
+  <div class="modal-body">
+    <input type="text" id="reason" name="reason" />
+  </div>
+  <div class="modal-footer">
+    <a href="#" class="btn" data-dismiss="modal" aria-hidden="true"><?php print $text_close; ?></a>
+    <a href="#" onclick="var reason = $('#reason').val(); if(reason) { Piler.bulk_remove_messages(reason); }" class="btn btn-primary" data-dismiss="modal" aria-hidden="true">OK</a>
+  </div>
+</div>
+<?php } ?>
+
 <?php if(!(OUTLOOK == 1 && SHOW_MENU_FOR_OUTLOOK == 0)) { ?>
     <div id="menu">
         <?php print $menu; ?>
@@ -72,7 +88,7 @@
             <div class="controls row-fluid">
                 <div id="input-span" class="span6">
                     <label for="_search"><?php print $text_search; ?></label>
-                <input type="text" id="_search" name="_search" placeholder="<?php print $text_enter_search_terms; ?>" <?php if(ENABLE_DELETE == 1) { ?>style="background: #faafbe;"<?php } ?> />
+                <input type="text" id="_search" name="_search" placeholder="<?php print $text_enter_search_terms; ?>" />
                 </div>
                 <div class="span6 input-append btn-group">
                     <button id="button_search" class="btn btn-large btn-danger" onclick="Piler.expert(this); return false;"><i class="icon-search icon-large"></i>&nbsp;<?php print $text_search; ?></button>
diff --git a/webui/view/theme/default/templates/login/login.tpl b/webui/view/theme/default/templates/login/login.tpl
index 7c392c0..3946369 100644
--- a/webui/view/theme/default/templates/login/login.tpl
+++ b/webui/view/theme/default/templates/login/login.tpl
@@ -57,10 +57,6 @@
                <p><a href="<?php print $auth_url; ?>"><?php print $text_login_via_google; ?></a></p>
             <?php } ?>
 
-        <?php if(ENABLE_DELETE == 1) { ?>
-            <p><?php print $text_compliance_warning; ?></p>
-        <?php } ?>
-
             <p><?php print COMPATIBILITY; ?></p>
         </div>
 
diff --git a/webui/view/theme/default/templates/search/helper.tpl b/webui/view/theme/default/templates/search/helper.tpl
index 283fc33..4d1e035 100644
--- a/webui/view/theme/default/templates/search/helper.tpl
+++ b/webui/view/theme/default/templates/search/helper.tpl
@@ -134,8 +134,6 @@
             <?php if($page < $total_pages) { ?><a href="#" class="navlink" onclick="Piler.navigation(<?php print $total_pages; ?>);"><i class="icon-double-angle-right icon-large"></i></a><?php } else { ?> <span class="navlink"><i class="icon-double-angle-right icon-large muted"></i></span><?php } ?>
             &nbsp;
 
-            <?php if(ENABLE_DELETE == 1) { ?><i class="icon-exclamation-sign" title="<?php print $text_compliance_warning; ?>"></i><?php } ?>
-
          <?php if(Registry::get('auditor_user') == 1 && $session->get("sphx_query")) { ?>
             <span style="margin-left: 30px;"><a href="#" onclick="Piler.show_message('messagebox1', '<?php print $session->get("sphx_query"); ?>', 5);">sphinx</a></span>
          <?php } ?>
@@ -155,7 +153,7 @@
             <?php } ?>
                 <a href="#" class="btn btn-custom btn-inverse" onclick="Piler.download_messages();"  title="<?php print $text_bulk_download; ?>"><i class="icon-download-alt"></i></a>
                 <!--a href="#" class="btn btn-custom btn-inverse" onclick="Piler.download_selected_as_pdf();"  title="<?php print $text_download_selected_hits_as_pdf; ?>"><i class="icon-file"></i></a-->
-                <?php if(ENABLE_DELETE == 1 && isAuditorUser() == 1) { ?><a href="#" class="btn btn-custom btn-inverse" onclick="Piler.bulk_remove_messages('<?php print $text_successfully_removed; ?>');"  title="<?php print $text_remove; ?>"><i class="icon-remove-sign"></i></a><?php } ?>
+                <?php if(ENABLE_DELETE == 1 && isAuditorUser() == 1) { ?><a href="#" class="btn btn-custom btn-inverse" onclick="Piler.show_bulk_remove_modal();"  title="<?php print $text_remove; ?>"><i class="icon-remove-sign"></i></a><?php } ?>
                 <input type="text" id="tag_value" name="tag_value" class="tagtext" />
                 <a href="#" class="btn btn-custom btn-inverse" onclick="Piler.tag_search_results('<?php print $text_tagged; ?>');" title="<?php print $text_tag_selected_messages; ?>"><i class="icon-tags" title="Tag"></i></a>
             </div>
diff --git a/webui/view/theme/mobile/templates/common/layout-search.tpl b/webui/view/theme/mobile/templates/common/layout-search.tpl
index a34bf12..c1d8ee5 100644
--- a/webui/view/theme/mobile/templates/common/layout-search.tpl
+++ b/webui/view/theme/mobile/templates/common/layout-search.tpl
@@ -50,6 +50,21 @@
   </div>
 </div>
 
+<?php if(Registry::get('auditor_user') == 1) { ?>
+<div id="deletebox-modal" class="modal hide fade">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" role="dialog" aria-hidden="true"><i class="icon-remove"></i></button>
+    <h3><?php print $text_delete_reason; ?></h3>
+  </div>
+  <div class="modal-body">
+    <input type="text" id="reason" name="reason" />
+  </div>
+  <div class="modal-footer">
+    <a href="#" class="btn" data-dismiss="modal" aria-hidden="true"><?php print $text_close; ?></a>
+    <a href="#" onclick="var reason =  $('#reason').val(); if(reason) { alert(reason); }" class="btn btn-primary" data-dismiss="modal" aria-hidden="true">OK</a>
+  </div>
+</div>
+<?php } ?>
 
 <div id="messagebox1"></div>
 
@@ -71,7 +86,7 @@
          <input type="hidden" name="ref" id="ref" value="" />
          <input type="hidden" name="prefix" id="prefix" value="" />
 
-         <input type="text" id="_search" name="_search" class="input-medium span6" value="" placeholder="<?php print $text_enter_search_terms; ?>" <?php if(ENABLE_DELETE == 1) { ?>style="background: #faafbe;"<?php } ?> />
+         <input type="text" id="_search" name="_search" class="input-medium span6" value="" placeholder="<?php print $text_enter_search_terms; ?>" />
 
       <?php if(OUTLOOK == 0) { ?>
          <a id="advsearch_caret" href="#" onclick="$('#searchpopup1').show();"><b class="caret"></b></a>
diff --git a/webui/view/theme/mobile/templates/login/login.tpl b/webui/view/theme/mobile/templates/login/login.tpl
index 4a764c8..74ff435 100644
--- a/webui/view/theme/mobile/templates/login/login.tpl
+++ b/webui/view/theme/mobile/templates/login/login.tpl
@@ -60,10 +60,6 @@
             <p><a href="<?php print $auth_url; ?>"><?php print $text_login_via_google; ?></a></p>
         <?php } ?>
 
-        <?php if(ENABLE_DELETE == 1) { ?>
-            <p><?php print $text_compliance_warning; ?></p>
-        <?php } ?>
-
             <p><?php print COMPATIBILITY; ?></p>
         </div>
 
diff --git a/webui/view/theme/mobile/templates/search/helper.tpl b/webui/view/theme/mobile/templates/search/helper.tpl
index 9a41ef7..ca8f73a 100644
--- a/webui/view/theme/mobile/templates/search/helper.tpl
+++ b/webui/view/theme/mobile/templates/search/helper.tpl
@@ -115,8 +115,6 @@
 
               <a href="#" onclick="Piler.download_messages();"  title="<?php print $text_bulk_download; ?>"><i class="icon-download-alt"></i></a>
               <a href="#" onclick="Piler.download_selected_as_pdf();"  title="<?php print $text_download_selected_hits_as_pdf; ?>"><i class="icon-file"></i></a>
-              <?php if(ENABLE_DELETE == 1 && isAuditorUser() == 1) { ?><a href="#" onclick="Piler.bulk_remove_messages('<?php print $text_successfully_removed; ?>');"  title="<?php print $text_remove; ?>"><i class="icon-remove-sign"></i></a><?php } ?>
-
 
               <input type="text" id="tag_value" name="tag_value" class="input-xlarge" placeholder="<?php print $text_tag_selected_messages; ?>" />
               <button class="btn" onclick="Piler.tag_search_results('<?php print $text_tagged; ?>'); return false;" >OK</button>