2 files changed, 23 insertions, 7 deletions
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index e80f703c16..5dfb8e83ed 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -3224,19 +3224,15 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * Returns the caption of the header. By default the header caption is
          * the property id of the column.
          * 
-         * @return the text in the default row of header, null if no default row
+         * @return the text in the default row of header.
          * 
          * @throws IllegalStateException
          *             if the column no longer is attached to the grid
          */
         public String getHeaderCaption() throws IllegalStateException {
             checkColumnIsAttached();
-            HeaderRow row = grid.getHeader().getDefaultRow();
-            if (row != null) {
-                return row.getCell(grid.getPropertyIdByColumnId(state.id))
-                        .getText();
-            }
-            return null;
+
+            return state.headerCaption;
         }
 
         /**
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridColumns.java b/server/tests/src/com/vaadin/tests/server/component/grid/GridColumns.java
index da230e86c7..83e9f21756 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridColumns.java
+++ b/server/tests/src/com/vaadin/tests/server/component/grid/GridColumns.java
@@ -18,6 +18,8 @@ package com.vaadin.tests.server.component.grid;
 import static org.easymock.EasyMock.and;
 import static org.easymock.EasyMock.capture;
 import static org.easymock.EasyMock.isA;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -391,4 +393,22 @@ public class GridColumns {
         assertFalse("Event should not be userOriginated",
                 event.isUserOriginated());
     }
+
+	@Test
+    public void textHeaderCaptionIsReturned() {
+        Column firstColumn = grid.getColumns().get(0);
+
+        firstColumn.setHeaderCaption("text");
+
+        assertThat(firstColumn.getHeaderCaption(), is("text"));
+    }
+
+    @Test
+    public void defaultCaptionIsReturnedForHtml() {
+        Column firstColumn = grid.getColumns().get(0);
+
+        grid.getDefaultHeaderRow().getCell("column0").setHtml("<b>html</b>");
+
+        assertThat(firstColumn.getHeaderCaption(), is("Column0"));
+    }
 }