diff --git a/content/messagecontent.js b/content/messagecontent.js
index 857871c..92874bf 100644
--- a/content/messagecontent.js
+++ b/content/messagecontent.js
@@ -125,14 +125,13 @@ var messageContent = {
       if (message.author)
         document.getElementById("briefAuthor").
                  setAttribute("value", message.author.person.name);
-//               appendChild(document.createTextNode(message.authorName));
       document.getElementById("briefTimestamp").
                appendChild(document.createTextNode(SnowlDateUtils._formatDate(message.timestamp)));
 
       // Basic headers
       if (message.author)
         document.getElementById("author").
-                 appendChild(document.createTextNode(message.author.name));
+                 appendChild(document.createTextNode(message.author.person.name));
       document.getElementById("timestamp").
                appendChild(document.createTextNode(SnowlDateUtils._formatDate(message.timestamp)));
 
@@ -315,8 +314,10 @@ var messageHeaderUtils = {
 
     if (aType == "toggle") {
       // Toggled to next in 3 way
+      // XXX: set index to 1, as full header removed for now (createFullHeader
+      // will not run, nor will button toggle to full).
       headerDeck = document.getElementById("headerDeck");
-      headerIndex = ++headerIndex > 2 ? 0 : headerIndex++;
+      headerIndex = ++headerIndex > 1 ? 0 : headerIndex++;
       headerBcaster.setAttribute("headerIndex", headerIndex);
     }
 
diff --git a/locale/en-US/message.dtd b/locale/en-US/message.dtd
index b95c215..07e3211 100644
--- a/locale/en-US/message.dtd
+++ b/locale/en-US/message.dtd
@@ -6,6 +6,7 @@
 <!ENTITY pinButton.label              "Pin Header">
 <!ENTITY pinButton.tooltip            "Toggle pin to set and unset permanent header">
 <!ENTITY toggleHeader.label           "Toggle Header">
-<!ENTITY toggleHeader.tooltip         "Toggle message header to brief, basic, or full; in basic or full header, toggle to save height after adjustment">
+<!ENTITY toggleHeader.tooltip         "Toggle message header to brief or basic; in basic header, toggle to save height after adjustment">
+<!-- <!ENTITY toggleHeader.tooltip         "Toggle message header to brief, basic, or full; in basic or full header, toggle to save height after adjustment"> -->
 <!ENTITY deleteMessagesButton.label   "Delete Message">
 <!ENTITY deleteMessagesButton.tooltip "Delete this Message">