diff --git a/actions/addpeopletag.php b/actions/addpeopletag.php
index e5e52b83f0..1c0ce55a2b 100644
--- a/actions/addpeopletag.php
+++ b/actions/addpeopletag.php
@@ -156,7 +156,7 @@ class AddpeopletagAction extends Action
             $unsubscribe = new UntagButton($this, $this->tagged, $this->peopletag);
             $unsubscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('subscriptions',
                                     array('nickname' => $this->user->nickname));
diff --git a/actions/approvegroup.php b/actions/approvegroup.php
index c87d743a7b..db64e05962 100644
--- a/actions/approvegroup.php
+++ b/actions/approvegroup.php
@@ -184,7 +184,7 @@ class ApprovegroupAction extends Action
                 $this->element('p', 'success', _('Join request canceled.'));
             }
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_redirect(common_local_url('groupmembers', array('nickname' =>
                                                                    $this->group->nickname)),
diff --git a/actions/approvesub.php b/actions/approvesub.php
index 89368686a9..b92ad66e7a 100644
--- a/actions/approvesub.php
+++ b/actions/approvesub.php
@@ -136,7 +136,7 @@ class ApprovesubAction extends Action
                 $this->element('p', 'success', _('Subscription canceled.'));
             }
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_redirect(common_local_url('subqueue', array('nickname' =>
                                                                $cur->nickname)),
diff --git a/actions/cancelgroup.php b/actions/cancelgroup.php
index 66ae6b3695..4196eb3ffc 100644
--- a/actions/cancelgroup.php
+++ b/actions/cancelgroup.php
@@ -162,7 +162,7 @@ class CancelgroupAction extends Action
             $jf = new JoinForm($this, $this->group);
             $jf->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_redirect(common_local_url('groupmembers', array('nickname' =>
                                                                    $this->group->nickname)),
diff --git a/actions/cancelsubscription.php b/actions/cancelsubscription.php
index 2baecbd226..590fde9f2e 100644
--- a/actions/cancelsubscription.php
+++ b/actions/cancelsubscription.php
@@ -114,7 +114,7 @@ class CancelsubscriptionAction extends Action
             $subscribe = new SubscribeForm($this, $other);
             $subscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_redirect(common_local_url('subscriptions',
                                              array('nickname' => $user->nickname)),
diff --git a/actions/deletegroup.php b/actions/deletegroup.php
index 0a0baf887c..5efb5e6a91 100644
--- a/actions/deletegroup.php
+++ b/actions/deletegroup.php
@@ -162,7 +162,7 @@ class DeletegroupAction extends RedirectingAction
             $this->elementStart('body');
             // @fixme add a sensible AJAX response form!
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             // @fixme if we could direct to the page on which this group
             // would have shown... that would be awesome
diff --git a/actions/disfavor.php b/actions/disfavor.php
index 40285be4cf..72b8d26f76 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -84,7 +84,7 @@ class DisfavorAction extends FormAction
             $favor = new FavorForm($this, $notice);
             $favor->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
             exit;
         }
     }
diff --git a/actions/favor.php b/actions/favor.php
index 05c95c5794..720d80541f 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -85,7 +85,7 @@ class FavorAction extends FormAction
             $disfavor = new DisFavorForm($this, $notice);
             $disfavor->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
             exit;
         }
         common_redirect(common_local_url('showfavorites',
diff --git a/actions/joingroup.php b/actions/joingroup.php
index da61086b68..af204698d8 100644
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -163,7 +163,7 @@ class JoingroupAction extends Action
             }
             $form->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_redirect(common_local_url('groupmembers', array('nickname' =>
                                                                    $this->group->nickname)),
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index 0d635ed0e2..d92dd37de5 100644
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -145,7 +145,7 @@ class LeavegroupAction extends Action
             $jf = new JoinForm($this, $this->group);
             $jf->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_redirect(common_local_url('groupmembers', array('nickname' =>
                                                                    $this->group->nickname)),
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 6816ffae6b..364be72a1a 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -154,7 +154,7 @@ class NewmessageAction extends FormAction
                 sprintf(_('Direct message to %s sent.'),
                     $this->other->nickname));
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('outbox',
                 array('nickname' => $this->scoped->nickname));
@@ -182,7 +182,7 @@ class NewmessageAction extends FormAction
         $this->elementStart('body');
         $this->element('p', array('id' => 'error'), $msg);
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 
     function showForm($msg = null)
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 749cfdecb3..7c324aaded 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -217,7 +217,7 @@ class NewnoticeAction extends FormAction
         $this->elementStart('body');
         $this->element('p', array('id' => 'error'), $msg);
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 
     /**
@@ -242,7 +242,7 @@ class NewnoticeAction extends FormAction
         $form->show();
 
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 
     /**
diff --git a/actions/nudge.php b/actions/nudge.php
index 3287711dee..0ca3753dc7 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -101,7 +101,7 @@ class NudgeAction extends Action
             // TRANS: Confirmation text after sending a nudge.
             $this->element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             // display a confirmation to the user
             common_redirect(common_local_url('showstream',
diff --git a/actions/pluginenable.php b/actions/pluginenable.php
index 156a604cf0..d48cef0183 100644
--- a/actions/pluginenable.php
+++ b/actions/pluginenable.php
@@ -141,7 +141,7 @@ class PluginEnableAction extends Action
             $form = $this->successNextForm();
             $form->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('pluginsadminpanel');
             common_redirect($url, 303);
diff --git a/actions/profilecompletion.php b/actions/profilecompletion.php
index 6bd8330e01..b859ccc943 100644
--- a/actions/profilecompletion.php
+++ b/actions/profilecompletion.php
@@ -151,7 +151,7 @@ class ProfilecompletionAction extends Action
             }
         }
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 
     function getResults()
diff --git a/actions/removepeopletag.php b/actions/removepeopletag.php
index 360d1c4c61..7077573999 100644
--- a/actions/removepeopletag.php
+++ b/actions/removepeopletag.php
@@ -158,7 +158,7 @@ class RemovepeopletagAction extends Action
             $unsubscribe = new TagButton($this, $this->tagged, $this->peopletag);
             $unsubscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('subscriptions',
                                     array('nickname' => $this->user->nickname));
diff --git a/actions/repeat.php b/actions/repeat.php
index 7433cf4b73..baa35f535e 100644
--- a/actions/repeat.php
+++ b/actions/repeat.php
@@ -107,7 +107,7 @@ class RepeatAction extends Action
                                 // TRANS: Confirmation text after repeating a notice.
                                 _('Repeated!'));
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             // @todo FIXME!
         }
diff --git a/actions/subscribe.php b/actions/subscribe.php
index faa833ade3..5b74c2503b 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -144,7 +144,7 @@ class SubscribeAction extends Action
             }
             $form->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('subscriptions',
                                     array('nickname' => $this->user->nickname));
diff --git a/actions/subscribepeopletag.php b/actions/subscribepeopletag.php
index 9a85e38ef6..1bb14420ff 100644
--- a/actions/subscribepeopletag.php
+++ b/actions/subscribepeopletag.php
@@ -140,7 +140,7 @@ class SubscribepeopletagAction extends Action
             $lf = new UnsubscribePeopletagForm($this, $this->peopletag);
             $lf->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_redirect(common_local_url('peopletagsubscribers',
                                 array('tagger' => $this->tagger->nickname,
diff --git a/actions/tagprofile.php b/actions/tagprofile.php
index b4312ad459..3acb9e4a86 100644
--- a/actions/tagprofile.php
+++ b/actions/tagprofile.php
@@ -94,7 +94,7 @@ class TagprofileAction extends Action
             $this->elementStart('body');
             $this->element('p', 'error', $error);
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $this->showPage();
         }
@@ -238,7 +238,7 @@ class TagprofileAction extends Action
                 }
 
                 $this->elementEnd('body');
-                $this->elementEnd('html');
+                $this->endHTML();
             } else {
                 // TRANS: Success message if lists are saved.
                 $this->error = _('Lists saved.');
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 8679ea6256..1beb295aec 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -102,7 +102,7 @@ class UnsubscribeAction extends Action
             $subscribe = new SubscribeForm($this, $other);
             $subscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_redirect(common_local_url('subscriptions',
                                              array('nickname' => $this->scoped->nickname)),
diff --git a/actions/unsubscribepeopletag.php b/actions/unsubscribepeopletag.php
index 5e144ab886..c739c6760c 100644
--- a/actions/unsubscribepeopletag.php
+++ b/actions/unsubscribepeopletag.php
@@ -133,7 +133,7 @@ class UnsubscribepeopletagAction extends Action
             $lf = new SubscribePeopletagForm($this, $this->peopletag);
             $lf->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             if (common_get_returnto()) {
                 common_redirect(common_get_returnto(), 303);
diff --git a/lib/error.php b/lib/error.php
index 4024a9affc..c24f3bbf43 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -119,6 +119,6 @@ class ErrorAction extends InfoAction
         $this->elementStart('body');
         $this->element('p', array('id' => 'error'), $this->message);
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 }
diff --git a/plugins/ActivitySpam/actions/train.php b/plugins/ActivitySpam/actions/train.php
index 69124b0dcc..c56f49fb51 100644
--- a/plugins/ActivitySpam/actions/train.php
+++ b/plugins/ActivitySpam/actions/train.php
@@ -147,7 +147,7 @@ class TrainAction extends Action
             $this->elementStart('body');
             $form->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_redirect(common_local_url('spam'), 303);
         }
diff --git a/plugins/AnonymousFave/actions/anondisfavor.php b/plugins/AnonymousFave/actions/anondisfavor.php
index 0060b7fa50..c54a39202c 100644
--- a/plugins/AnonymousFave/actions/anondisfavor.php
+++ b/plugins/AnonymousFave/actions/anondisfavor.php
@@ -94,7 +94,7 @@ class AnonDisfavorAction extends RedirectingAction
             $favor = new AnonFavorForm($this, $notice);
             $favor->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $this->returnToPrevious();
         }
diff --git a/plugins/AnonymousFave/actions/anonfavor.php b/plugins/AnonymousFave/actions/anonfavor.php
index 61868125c1..da8757082e 100644
--- a/plugins/AnonymousFave/actions/anonfavor.php
+++ b/plugins/AnonymousFave/actions/anonfavor.php
@@ -89,7 +89,7 @@ class AnonFavorAction extends RedirectingAction
             $disfavor = new AnonDisFavorForm($this, $notice);
             $disfavor->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $this->returnToPrevious();
         }
diff --git a/plugins/Bookmark/actions/bookmarkforurl.php b/plugins/Bookmark/actions/bookmarkforurl.php
index 4e6de9bffa..8eb02e64a0 100644
--- a/plugins/Bookmark/actions/bookmarkforurl.php
+++ b/plugins/Bookmark/actions/bookmarkforurl.php
@@ -115,7 +115,7 @@ class BookmarkforurlAction extends Action
         $bf = new BookmarkForm($this, $this->title, $this->url, null, null, $this->thumbnail);
         $bf->show();
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 
     /**
diff --git a/plugins/GroupPrivateMessage/actions/newgroupmessage.php b/plugins/GroupPrivateMessage/actions/newgroupmessage.php
index 37738a385c..9b611edc86 100644
--- a/plugins/GroupPrivateMessage/actions/newgroupmessage.php
+++ b/plugins/GroupPrivateMessage/actions/newgroupmessage.php
@@ -149,7 +149,7 @@ class NewgroupmessageAction extends Action
                            sprintf(_m('Direct message to %s sent.'),
                                    $this->group->nickname));
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_redirect($gm->url, 303);
         }
diff --git a/plugins/QnA/actions/qnanewanswer.php b/plugins/QnA/actions/qnanewanswer.php
index 92b640c166..49ba5baa69 100644
--- a/plugins/QnA/actions/qnanewanswer.php
+++ b/plugins/QnA/actions/qnanewanswer.php
@@ -226,7 +226,7 @@ class QnanewanswerAction extends Action
         $this->elementStart('body');
         $this->element('p', array('id' => 'error'), $msg);
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 
     /**
@@ -252,7 +252,7 @@ class QnanewanswerAction extends Action
         $form->show();
 
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 
     /**
diff --git a/plugins/SearchSub/actions/searchsub.php b/plugins/SearchSub/actions/searchsub.php
index 0234feef40..dcd072e8f8 100644
--- a/plugins/SearchSub/actions/searchsub.php
+++ b/plugins/SearchSub/actions/searchsub.php
@@ -139,7 +139,7 @@ class SearchsubAction extends Action
             $unsubscribe = new SearchUnsubForm($this, $this->search);
             $unsubscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('search',
                                     array('search' => $this->search));
diff --git a/plugins/SearchSub/actions/searchunsub.php b/plugins/SearchSub/actions/searchunsub.php
index f7f006e21c..a6ce0f07c5 100644
--- a/plugins/SearchSub/actions/searchunsub.php
+++ b/plugins/SearchSub/actions/searchunsub.php
@@ -79,7 +79,7 @@ class SearchunsubAction extends SearchsubAction
             $subscribe = new SearchSubForm($this, $this->search);
             $subscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('search',
                                     array('search' => $this->search));
diff --git a/plugins/SubMirror/actions/basemirror.php b/plugins/SubMirror/actions/basemirror.php
index e6bbaf6864..bc5e2b541c 100644
--- a/plugins/SubMirror/actions/basemirror.php
+++ b/plugins/SubMirror/actions/basemirror.php
@@ -167,7 +167,7 @@ abstract class BaseMirrorAction extends Action
             $unsubscribe = new EditMirrorForm($this, $this->profile);
             $unsubscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('mirrorsettings');
             common_redirect($url, 303);
diff --git a/plugins/SubMirror/actions/mirrorsettings.php b/plugins/SubMirror/actions/mirrorsettings.php
index 272698abc3..b8e23ca561 100644
--- a/plugins/SubMirror/actions/mirrorsettings.php
+++ b/plugins/SubMirror/actions/mirrorsettings.php
@@ -126,8 +126,7 @@ class MirrorSettingsAction extends SettingsAction
     function handle($args)
     {
         if ($this->boolean('ajax')) {
-            header('Content-Type: text/html;charset=utf-8');
-            $this->elementStart('html');
+            $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             // TRANS: Title for page with form to add a mirror feed provider on.
             $this->element('title', null, _m('Provider add'));
@@ -137,7 +136,7 @@ class MirrorSettingsAction extends SettingsAction
             $this->showAddFeedForm();
 
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             return parent::handle($args);
         }
diff --git a/plugins/TagSub/actions/tagsub.php b/plugins/TagSub/actions/tagsub.php
index 18335f4cc8..dd8c76b53d 100644
--- a/plugins/TagSub/actions/tagsub.php
+++ b/plugins/TagSub/actions/tagsub.php
@@ -139,7 +139,7 @@ class TagsubAction extends Action
             $unsubscribe = new TagUnsubForm($this, $this->tag);
             $unsubscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('tag',
                                     array('tag' => $this->tag));
diff --git a/plugins/TagSub/actions/tagunsub.php b/plugins/TagSub/actions/tagunsub.php
index 26fb9ffec8..43afab08e3 100644
--- a/plugins/TagSub/actions/tagunsub.php
+++ b/plugins/TagSub/actions/tagunsub.php
@@ -79,7 +79,7 @@ class TagunsubAction extends TagsubAction
             $subscribe = new TagSubForm($this, $this->tag);
             $subscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('tag',
                                     array('tag' => $this->tag));
diff --git a/plugins/YammerImport/actions/yammeradminpanel.php b/plugins/YammerImport/actions/yammeradminpanel.php
index f8e099109e..d1b9259f8b 100644
--- a/plugins/YammerImport/actions/yammeradminpanel.php
+++ b/plugins/YammerImport/actions/yammeradminpanel.php
@@ -142,7 +142,7 @@ class YammeradminpanelAction extends AdminPanelAction
         $this->elementStart('body');
         $form->show();
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 
     /**
diff --git a/plugins/YammerImport/actions/yammerauth.php b/plugins/YammerImport/actions/yammerauth.php
index d25be91440..8a648702ca 100644
--- a/plugins/YammerImport/actions/yammerauth.php
+++ b/plugins/YammerImport/actions/yammerauth.php
@@ -72,6 +72,6 @@ class YammerauthAction extends AdminPanelAction
         $this->elementStart('body');
         $form->show();
         $this->elementEnd('body');
-        $this->elementEnd('html');
+        $this->endHTML();
     }
 }