diff --git a/serendipity_plugin_twitter/ChangeLog b/serendipity_plugin_twitter/ChangeLog
index 4b00e49c..a7bb6504 100644
--- a/serendipity_plugin_twitter/ChangeLog
+++ b/serendipity_plugin_twitter/ChangeLog
@@ -11,6 +11,9 @@ TODO:
 
 1.62
 --------------------------
+    * Emit the twitter timeline header at the proper place in the markup,
+      including a CSS fix and making it more flexible for markup changes
+      in 2.x (yellowled)
     * Fixed a markup bug for twitter timeline (yellowled)
 
 1.61
diff --git a/serendipity_plugin_twitter/serendipity_event_twitter.php b/serendipity_plugin_twitter/serendipity_event_twitter.php
index d424bab6..8e05d055 100644
--- a/serendipity_plugin_twitter/serendipity_event_twitter.php
+++ b/serendipity_plugin_twitter/serendipity_event_twitter.php
@@ -2112,9 +2112,9 @@ a.twitter_update_time {
             else {
                 if ($account_type == "twitter"){
                     if ($_POST['tweeter_timeline']){
-                        $buffer .= "<h2>".PLUGIN_EVENT_TWITTER_TIMELINE.": ".$_POST['tweeter_timeline']."</h2>";
+                        $buffer_header = PLUGIN_EVENT_TWITTER_TIMELINE.": ".$_POST['tweeter_timeline'];
                     } else {
-                        $buffer .= "<h2>".PLUGIN_EVENT_TWITTER_TIMELINE.": ".$this->get_config('tweeter_timeline')."</h2>";
+                        $buffer_header = PLUGIN_EVENT_TWITTER_TIMELINE.": ".$this->get_config('tweeter_timeline');
                     }
                 }
 
diff --git a/serendipity_plugin_twitter/tweeter/serendipity_event_twitter_tweeter.css b/serendipity_plugin_twitter/tweeter/serendipity_event_twitter_tweeter.css
index d2f1ccc9..55ebbaeb 100644
--- a/serendipity_plugin_twitter/tweeter/serendipity_event_twitter_tweeter.css
+++ b/serendipity_plugin_twitter/tweeter/serendipity_event_twitter_tweeter.css
@@ -1,4 +1,4 @@
-/* 
+/*
  * You may copy this in your templates root path and edit it
  *
  */
@@ -12,8 +12,12 @@
 	display:inline;
 }
 
+.serendipity_admin_tweeter_header,
+#serendipity_admin_tweeter_statuses {
+    clear:both;
+}
+
 #serendipity_admin_tweeter_statuses {
-	clear:both;
 	width:400px;
 	margin:0;
 	padding:0;
diff --git a/serendipity_plugin_twitter/tweeter/tweeter_history.inc.php b/serendipity_plugin_twitter/tweeter/tweeter_history.inc.php
index 9bee8b77..d8ec7a06 100644
--- a/serendipity_plugin_twitter/tweeter/tweeter_history.inc.php
+++ b/serendipity_plugin_twitter/tweeter/tweeter_history.inc.php
@@ -4,9 +4,18 @@ if (IN_serendipity !== true) {
 }
 ?>
 
-<ul id="serendipity_admin_tweeter_statuses">
-<?php echo $buffer; ?>
-</ul>
+<?php
+    if ($GLOBALS['serendipity']['version'][0] == '1') {
+        echo '<h2 class="serendipity_admin_tweeter_header">' . $buffer_header . '</h2>';
+    } else {
+        echo '<h3 class="serendipity_admin_tweeter_header">' . $buffer_header . '</h3>';
+    }
+?>
+
+    <ul id="serendipity_admin_tweeter_statuses">
+    <?php echo $buffer; ?>
+    </ul>
+
 <?php
     if ($GLOBALS['serendipity']['version'][0] == '1') {
         echo '<div class="tweeter_clearfix"></div>';