diff --git a/includes/base.inc b/includes/base.inc
index 0e2a407..2940245 100644
--- a/includes/base.inc
+++ b/includes/base.inc
@@ -331,8 +331,8 @@ class views_object {
         else if (!empty($definition[$key]['translatable']) && !empty($value)) {
           // Build source data and add to the array
           $format = NULL;
-          if (isset($definition['format_key']) && isset($options[$definition['format_key']])) {
-            $format = $options[$definition['format_key']];
+          if (isset($definition[$key]['format_key']) && isset($options[$definition[$key]['format_key']])) {
+            $format = $storage[$definition[$key]['format_key']];
           }
           $translatable[] = array(
             'value' => $value,
@@ -346,8 +346,8 @@ class views_object {
       $value = $options;
       // Build source data and add to the array
       $format = NULL;
-      if (isset($definition['format_key']) && isset($options[$definition['format_key']])) {
-        $format = $options[$definition['format_key']];
+      if (isset($definition['format_key']) && isset($storage[$definition['format_key']])) {
+        $format = $storage[$definition['format_key']];
       }
       $translatable[] = array(
         'value' => $value,
diff --git a/tests/views_translatable.test b/tests/views_translatable.test
index 0cb27e4..983a97e 100644
--- a/tests/views_translatable.test
+++ b/tests/views_translatable.test
@@ -114,7 +114,6 @@ class ViewsTranslatableTest extends ViewsSqlTest {
         'more1' => array('use_more_text'),
         'Reset1' => array('exposed_form', 'reset_button_label'),
         'Offset1' => array('pager', 'expose', 'offset_label'),
-        'Master1' => array('title'),
         'title1' => array('title'),
         'Tag first1' => array('pager', 'tags', 'first'),
         'Tag prev1' => array('pager', 'tags', 'previous'),
@@ -124,9 +123,23 @@ class ViewsTranslatableTest extends ViewsSqlTest {
         'fieldlabel1' => array('field', 'node', 'nid', 'label'),
         'filterlabel1' => array('filter', 'node', 'nid', 'expose', 'label'),
         '- All -' => array('pager', 'expose', 'items_per_page_options_all_label'),
+        'Header1' => array('header', 'views', 'area', 'content'),
+      );
+
+      $formats = array(
+        'Header1' => 'filtered_html',
       );
+
       foreach ($translatables as $translatable) {
         $this->assertEqual($translatable['keys'], $this->string_keys[$translatable['value']]);
+
+        // Make sure the format is correct.
+        if (isset($formats[$translatable['value']])) {
+          $this->assertEqual($translatable['format'], $formats[$translatable['value']]);
+        }
+        else {
+          $this->assertNull($translatable['format'], 'No format defined');
+        }
       }
     }
   }
@@ -169,6 +182,14 @@ class ViewsTranslatableTest extends ViewsSqlTest {
     $handler->display->display_options['pager']['options']['expose']['offset_label'] = 'Offset1';
     $handler->display->display_options['style_plugin'] = 'default';
     $handler->display->display_options['row_plugin'] = 'fields';
+    /* Global: Header */
+    $handler->display->display_options['header']['area']['id'] = 'area';
+    $handler->display->display_options['header']['area']['table'] = 'views';
+    $handler->display->display_options['header']['area']['field'] = 'area';
+    $handler->display->display_options['header']['area']['empty'] = FALSE;
+    $handler->display->display_options['header']['area']['content'] = 'Header1';
+    $handler->display->display_options['header']['area']['format'] = 'filtered_html';
+    $handler->display->display_options['header']['area']['tokenize'] = 0;
     /* Field: Content: Nid */
     $handler->display->display_options['fields']['nid']['id'] = 'nid';
     $handler->display->display_options['fields']['nid']['table'] = 'node';