diff --git a/i18n_menu/i18n_menu.info b/i18n_menu/i18n_menu.info
index dafff18..af7c68f 100644
--- a/i18n_menu/i18n_menu.info
+++ b/i18n_menu/i18n_menu.info
@@ -10,3 +10,4 @@ core = 7.x
 
 files[] = i18n_menu.inc
 files[] = i18n_menu.test
+files[] = i18n_menu_context.test
diff --git a/i18n_menu/i18n_menu.module b/i18n_menu/i18n_menu.module
index c1b3153..a93cf84 100644
--- a/i18n_menu/i18n_menu.module
+++ b/i18n_menu/i18n_menu.module
@@ -500,17 +500,10 @@ function i18n_menu_navigation_links($menu_name, $level = 0) {
  */
 function i18n_menu_preprocess_page(&$vars) {
   if (!empty($vars['main_menu']) && theme_get_setting('toggle_main_menu')) {
-    $vars['main_menu'] = i18n_menu_navigation_links(variable_get('menu_main_links_source', 'main-menu'));;
+    _i18n_menu_links_array_localize($vars['main_menu']);
   }
   if (!empty($vars['secondary_menu']) && theme_get_setting('toggle_secondary_menu')) {
-    // If the secondary menu source is set as the primary menu, we display the
-    // second level of the primary menu.
-    if (variable_get('menu_secondary_links_source', 'user-menu') == variable_get('menu_main_links_source', 'main-menu')) {
-      $vars['secondary_menu'] = i18n_menu_navigation_links(variable_get('menu_main_links_source', 'main-menu'), 1);
-    }
-    else {
-      $vars['secondary_menu'] = i18n_menu_navigation_links(variable_get('menu_secondary_links_source', 'user-menu'), 0);
-    }
+    _i18n_menu_links_array_localize($vars['secondary_menu']);
   }
 }
 
@@ -535,6 +528,40 @@ function _i18n_menu_link_localize(&$link, $langcode = NULL) {
 }
 
 /**
+ * Localize menu link array items title and description
+ */
+function _i18n_menu_links_array_localize(&$links, $langcode = NULL) {
+  $langcode = i18n_langcode($langcode);
+  foreach ($links as $key => $link){
+    /*$mlid = explode('-', $key);
+    $mlid = explode(' ', $mlid[1]);
+    $mlid = $mlid[0];*/
+    // same as above, but in one line. better? or regex?
+    $mlid = substr($key, 5, (strpos(' ', $key) !== FALSE) ? strpos(' ', $key) - 5 : 255);
+    $item = menu_link_load($mlid);
+    if ($menulang = i18n_object_langcode($item)) {
+      if ($menulang != $langcode) {
+        unset($links[$key]);
+      }
+    }
+
+    else {
+      $item['title'] = _i18n_menu_link_title($item, $langcode);
+
+      if ($description = _i18n_menu_link_description($item, $langcode)) {
+        $links[$key]['attributes']['title'] = $description;
+      }
+
+      // todo: localize subtree problem since $links is a single level of links, but is it really needed?
+      // Localize subtree.
+      //if ($item['below'] !== FALSE) {
+      //  $item['below'] = i18n_menu_localize_tree($item['below'], $langcode);
+      //}
+    }
+  }
+}
+
+/**
  * Get localized menu description
  */
 function _i18n_menu_link_description($link, $langcode = NULL) {
diff --git a/i18n_menu/i18n_menu_context.test b/i18n_menu/i18n_menu_context.test
new file mode 100644
index 0000000..0d15e5f
--- /dev/null
+++ b/i18n_menu/i18n_menu_context.test
@@ -0,0 +1,45 @@
+<?php
+
+class i18nMenuContextTestCase extends Drupali18nTestCase {
+  protected $profile = 'testing';
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Menu context',
+      'description' => 'Test i18n_menu with context menu reaction.',
+      'group' => 'Internationalization',
+    );
+  }
+
+  function setUp() {
+    parent::setUp('i18n_menu', 'context', 'ctools', 'menu', 'blog');
+    parent::setUpLanguages(array(
+      'administer menu',
+      'administer site configuration',
+      'create blog content',
+    ));
+  }
+
+  function test() {
+    ctools_include('export');
+    $context = ctools_export_new_object('context');
+    $context->name = 'testcontext';
+    $context->conditions = array('sitewide' => array('values' => array(1)));
+    $context->reactions = array('menu' => 'node/add');
+    $saved = context_save($context);
+    $this->assertTrue($saved, "Context 'testcontext' saved.");
+
+    $this->drupalPost('admin/structure/menu/settings', array('menu_main_links_source' => 'navigation'), 'Save configuration');
+    theme_enable(array('bartik'));
+    variable_set('theme_default', 'bartik');
+    $this->refreshVariables();
+
+    $output = $this->drupalGet('user');
+    $url = url('node/add');
+    $active = $this->xpath('//li[contains(@class, "active")]/a[@href="' . $url . '"]');
+    $this->assertTrue(!empty($active), t('Active menu item found.'));
+
+    // Cleanup
+    context_delete($context);
+  }
+}