19 files changed, 15 insertions, 20 deletions
diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc
index 23e657974..20a49a169 100644
--- a/program/steps/mail/addcontact.inc
+++ b/program/steps/mail/addcontact.inc
@@ -60,4 +60,4 @@ if (!$done)
   $OUTPUT->show_message('errorsavingcontact', 'warning');
 
 $OUTPUT->send();
-?>
+
diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc
index 2b4a59024..dca727278 100644
--- a/program/steps/mail/attachments.inc
+++ b/program/steps/mail/attachments.inc
@@ -152,4 +152,3 @@ else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 $OUTPUT->command('auto_save_start', false);
 $OUTPUT->send('iframe');
 
-?>
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 4fbea1fba..4b6b6f964 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -85,4 +85,3 @@ function contact_results_sort($a, $b)
   return strcoll(trim($name_a, '" '), trim($name_b, '" '));
 }
 
-?>
diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc
index 3031bf715..19d4fb85f 100644
--- a/program/steps/mail/check_recent.inc
+++ b/program/steps/mail/check_recent.inc
@@ -84,4 +84,4 @@ foreach ($a_mailboxes as $mbox_name) {
 
 $OUTPUT->send();
 
-?>
+
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 6f183d3a1..a0b68d2f0 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1134,4 +1134,4 @@ $OUTPUT->add_handlers(array(
 
 $OUTPUT->send('compose');
 
-?>
+
diff --git a/program/steps/mail/copy.inc b/program/steps/mail/copy.inc
index 3ddae613b..175994f8e 100644
--- a/program/steps/mail/copy.inc
+++ b/program/steps/mail/copy.inc
@@ -54,4 +54,4 @@ else {
 // send response
 $OUTPUT->send();
 
-?>
+
diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc
index a4d71d2c0..ce3406c83 100644
--- a/program/steps/mail/folders.inc
+++ b/program/steps/mail/folders.inc
@@ -71,4 +71,4 @@ else if ($RCMAIL->action=='purge' && ($mbox = get_input_value('_mbox', RCUBE_INP
 
 $OUTPUT->send($commands);
 
-?>
+
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 805f0af97..911832691 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1606,4 +1606,4 @@ $OUTPUT->add_handlers(array(
   'searchform' => array($OUTPUT, 'search_form'),
 ));
 
-?>
+
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 89180dd3a..9ebdf4367 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -129,4 +129,4 @@ else {
 header('HTTP/1.1 404 Not Found');
 exit;
 
-?>
+
diff --git a/program/steps/mail/getunread.inc b/program/steps/mail/getunread.inc
index 625e3dc68..af927fc00 100644
--- a/program/steps/mail/getunread.inc
+++ b/program/steps/mail/getunread.inc
@@ -42,4 +42,4 @@ if (!empty($a_folders))
 
 $OUTPUT->send();
 
-?>
+
diff --git a/program/steps/mail/headers.inc b/program/steps/mail/headers.inc
index aa1065531..5d071cc08 100644
--- a/program/steps/mail/headers.inc
+++ b/program/steps/mail/headers.inc
@@ -47,4 +47,4 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_POST))
 
 exit;
 
-?>
+
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index cf3855169..69d03b3bf 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -102,5 +102,4 @@ else
 // send response
 $OUTPUT->send();
 
-?>
 
diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index 973ce687e..6d102aff7 100644
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -123,4 +123,4 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
 }
 
 exit;
-?>
+
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 11eb24227..3947ad123 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -135,4 +135,4 @@ else
 // send response
 $OUTPUT->send();
 
-?>
+
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index 52469952a..e512e79b3 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -134,4 +134,4 @@ $OUTPUT->set_env('pagecount', ceil($count/$IMAP->page_size));
 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1));
 $OUTPUT->send();
 
-?>
+
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index e229234c1..91f374cea 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -695,4 +695,4 @@ else
   $OUTPUT->send('iframe');
   }
 
-?>
+
diff --git a/program/steps/mail/sendmdn.inc b/program/steps/mail/sendmdn.inc
index ba6d37f0c..880c5c578 100644
--- a/program/steps/mail/sendmdn.inc
+++ b/program/steps/mail/sendmdn.inc
@@ -40,5 +40,3 @@ else {
 }
 
 $OUTPUT->send();
-
-?>
-\ No newline at end of file
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 71cbf7086..69b30eb4d 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -228,4 +228,4 @@ if ($MESSAGE && $MESSAGE->headers && !$MESSAGE->headers->seen &&
 
 exit;
 
-?>
+
diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc
index 2e2228ab6..a110238d9 100644
--- a/program/steps/mail/viewsource.inc
+++ b/program/steps/mail/viewsource.inc
@@ -56,4 +56,4 @@ else
 }
 
 exit;
-?>
+