12 files changed, 3 insertions, 14 deletions
diff --git a/program/steps/addressbook/copy.inc b/program/steps/addressbook/copy.inc
index 525f9278a..1b938726c 100644
--- a/program/steps/addressbook/copy.inc
+++ b/program/steps/addressbook/copy.inc
@@ -91,4 +91,3 @@ if ($cid && preg_match('/^[a-zA-Z0-9\+\/=_-]+(,[a-zA-Z0-9\+\/=_-]+)*$/', $cid) &
 // send response
 $OUTPUT->send();
 
-?>
diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc
index da83757a8..ba0ac0fad 100644
--- a/program/steps/addressbook/delete.inc
+++ b/program/steps/addressbook/delete.inc
@@ -49,4 +49,4 @@ if ($OUTPUT->ajax_call &&
   }
 
 exit;
-?>
+
diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
index 3e2d8c583..96a2f39ee 100644
--- a/program/steps/addressbook/edit.inc
+++ b/program/steps/addressbook/edit.inc
@@ -110,4 +110,4 @@ if (!$CONTACTS->get_result() && $OUTPUT->template_exists('addcontact'))
 
 // this will be executed if no template for addcontact exists
 $OUTPUT->send('editcontact');
-?>
+
diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
index 7e6855e92..15d1e7233 100644
--- a/program/steps/addressbook/export.inc
+++ b/program/steps/addressbook/export.inc
@@ -41,4 +41,3 @@ while ($result && ($row = $result->next())) {
 
 exit;
 
-?>
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index c044fc331..a43acd9c8 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -236,4 +236,3 @@ $OUTPUT->add_handlers(array(
   'searchform' => array($OUTPUT, 'search_form')
 ));
 
-?>
diff --git a/program/steps/addressbook/groups.inc b/program/steps/addressbook/groups.inc
index c98d4d840..004096aaf 100644
--- a/program/steps/addressbook/groups.inc
+++ b/program/steps/addressbook/groups.inc
@@ -98,4 +98,3 @@ else if ($RCMAIL->action == 'group-delete') {
 // send response
 $OUTPUT->send();
 
-?>
diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc
index ace9ad32d..9ba1c1d90 100644
--- a/program/steps/addressbook/import.inc
+++ b/program/steps/addressbook/import.inc
@@ -188,5 +188,3 @@ $OUTPUT->add_handlers(array(
 
 // render page
 $OUTPUT->send('importcontacts');
-
-?>
-\ No newline at end of file
diff --git a/program/steps/addressbook/list.inc b/program/steps/addressbook/list.inc
index 71b9379b1..cc8c0bbfd 100644
--- a/program/steps/addressbook/list.inc
+++ b/program/steps/addressbook/list.inc
@@ -32,4 +32,3 @@ rcmail_js_contacts_list($result);
 // send response
 $OUTPUT->send();
 
-?>
-\ No newline at end of file
diff --git a/program/steps/addressbook/mailto.inc b/program/steps/addressbook/mailto.inc
index 002c4e801..4b4f524e3 100644
--- a/program/steps/addressbook/mailto.inc
+++ b/program/steps/addressbook/mailto.inc
@@ -47,4 +47,3 @@ else
 // send response
 $OUTPUT->send();
 
-?>
-\ No newline at end of file
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 168d995a1..a277008c8 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -131,4 +131,4 @@ else
   }
 }
 
-?>
+
diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
index 790db060d..e5ace2451 100644
--- a/program/steps/addressbook/search.inc
+++ b/program/steps/addressbook/search.inc
@@ -49,5 +49,3 @@ $OUTPUT->command('set_rowcount', rcmail_get_rowcount_text());
   
 // send response
 $OUTPUT->send();
-
-?>
-\ No newline at end of file
diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc
index 8ceaac28c..f3bea3094 100644
--- a/program/steps/addressbook/show.inc
+++ b/program/steps/addressbook/show.inc
@@ -72,4 +72,3 @@ function rcmail_contact_details($attrib)
 //$OUTPUT->framed = $_framed;
 $OUTPUT->add_handler('contactdetails', 'rcmail_contact_details');
 $OUTPUT->send('showcontact');
-?>
-\ No newline at end of file