diff --git a/core/src/main/java/hudson/widgets/HistoryWidget.java b/core/src/main/java/hudson/widgets/HistoryWidget.java
index 5465000628b004dd3b6f6d7000e305288c73afd1..24882058b8b735bd08732416f21aaf1772cd7fb0 100644
--- a/core/src/main/java/hudson/widgets/HistoryWidget.java
+++ b/core/src/main/java/hudson/widgets/HistoryWidget.java
@@ -151,6 +151,8 @@ public class HistoryWidget<O extends ModelObject,T> extends Widget {
     public void doAjax( StaplerRequest req, StaplerResponse rsp,
                   @Header("n") String n ) throws IOException, ServletException {
 
+        // FIXME n can be null if the client behave incorrectly. We should fail gracefully (404?) instead of NPEing
+
         rsp.setContentType("text/html;charset=UTF-8");
 
         // pick up builds to send back
diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
index 78ca3aacd56cd3cdd049612cc641381805bd7f2e..772c996d93171d39586052cb777966cc46bc7295 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
@@ -48,6 +48,13 @@ THE SOFTWARE.
       <tr class="build-row">
         <td colspan="3" align="right">
           <script>
+            function replace(a, b) {
+                  var p = a.parentNode;
+                  var next = a.nextSibling;
+                  p.removeChild(a);
+                  p.insertBefore(b,next);
+            }
+
             function loadAllBuildHistory() {
               // first display the "loading..." icon
               var box = $("loadAllBuildHistory");
@@ -59,14 +66,12 @@ THE SOFTWARE.
                 onComplete: function(rsp,_) {
                   <!-- neither outerHTML nor responseXML works in Firefox 2.0 -->
                   var hist = $$("buildHistory");
-                  var p = hist.parentNode;
-                  var next = hist.nextSibling;
-                  p.removeChild(hist);
 
-                  var div = document.createElement('div');
-                  div.innerHTML = rsp.responseText;
+                  var newhist = document.createElement('div');
+                  newhist.innerHTML = rsp.responseText;
+                  newhist.headers = hist.headers
 
-                  p.insertBefore(div,next);
+                  replace(hist, newhist);
                 }
             });
             }
diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 51391c8283189933a2c4b9706fa207401529ea82..cac382dee776afa68b45a695e1c18fac5b6a09bd 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -1472,6 +1472,9 @@ function updateBuildHistory(ajaxUrl,nBuild) {
 
     function updateBuilds() {
         var bh = $('buildHistory');
+        if (bh.headers == null) {
+            // Yahoo.log("Missing headers in buildHistory element");
+        }
         new Ajax.Request(ajaxUrl, {
             requestHeaders: bh.headers,
             onSuccess: function(rsp) {