diff --git a/iphone/Maps/Settings/CountriesViewController.mm b/iphone/Maps/Settings/CountriesViewController.mm
index 3743ae4609..18499bb593 100644
--- a/iphone/Maps/Settings/CountriesViewController.mm
+++ b/iphone/Maps/Settings/CountriesViewController.mm
@@ -123,6 +123,7 @@ static NSInteger RowFromIndex(TIndex const & index)
   case EDownloading:
   	{
     	cell.textLabel.textColor = [UIColor blueColor];
+      cell.detailTextLabel.text = @"Downloading...";
       if (!indicator)
       {
       	indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle: UIActivityIndicatorViewStyleGray];
diff --git a/iphone/Maps/Settings/SettingsManager.mm b/iphone/Maps/Settings/SettingsManager.mm
index d76898e95e..a59e8e095c 100644
--- a/iphone/Maps/Settings/SettingsManager.mm
+++ b/iphone/Maps/Settings/SettingsManager.mm
@@ -57,20 +57,20 @@ using namespace storage;
   	g_navController = [[UINavigationController alloc] initWithRootViewController:rootViewController];
     
     // tricky boost::bind for objC class methods
-		typedef void (*TChangeFunc)(SEL, TIndex const &);
+		typedef void (*TChangeFunc)(id, SEL, TIndex const &);
 		SEL changeSel = @selector(OnCountryChange:);
 		TChangeFunc changeImpl = (TChangeFunc)[self methodForSelector:changeSel];
 
-		typedef void (*TProgressFunc)(SEL, TIndex const &, TDownloadProgress const &);
+		typedef void (*TProgressFunc)(id, SEL, TIndex const &, TDownloadProgress const &);
 		SEL progressSel = @selector(OnCountryDownload:withProgress:);
 		TProgressFunc progressImpl = (TProgressFunc)[self methodForSelector:progressSel];
 
-		typedef void (*TUpdateFunc)(SEL, int64_t, char const *);
+		typedef void (*TUpdateFunc)(id, SEL, int64_t, char const *);
 		SEL updateSel = @selector(OnUpdateCheck:);
 		TUpdateFunc updateImpl = (TUpdateFunc)[self methodForSelector:updateSel];
 
-		storage.Subscribe(boost::bind(changeImpl, changeSel, _1),
-    		boost::bind(progressImpl, progressSel, _1, _2), boost::bind(updateImpl, updateSel, _1, _2));
+		storage.Subscribe(boost::bind(changeImpl, self, changeSel, _1),
+    		boost::bind(progressImpl, self, progressSel, _1, _2), boost::bind(updateImpl, self, updateSel, _1, _2));
   }
 
   [parentController presentModalViewController:g_navController animated:YES];
diff --git a/storage/storage.cpp b/storage/storage.cpp
index 73f8cf4ce5..e4e718faaa 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -85,6 +85,10 @@ namespace storage
         return EInQueue;
     }
 
+    // second, check if this country has failed while downloading
+    if (m_failedCountries.find(index) != m_failedCountries.end())
+      return EDownloadFailed;
+
     TLocalAndRemoteSize size = CountryByIndex(index).Size();
     if (size.first == size.second)
     {
@@ -105,7 +109,9 @@ namespace storage
     { // do nothing
       return;
     }
-    // otherwise add it into the queue
+    // remove it from failed list
+    m_failedCountries.erase(index);
+    // add it into the queue
     m_queue.push_back(index);
     // and start download if necessary
     if (m_queue.size() == 1)
@@ -280,6 +286,7 @@ namespace storage
       // remove failed country from the queue
       TIndex failedIndex = m_queue.front();
       m_queue.pop_front();
+      m_failedCountries.insert(failedIndex);
       // notify GUI about failed country
       if (m_observerChange)
         m_observerChange(failedIndex);
diff --git a/storage/storage.hpp b/storage/storage.hpp
index 59a85d3571..a30dac70a6 100644
--- a/storage/storage.hpp
+++ b/storage/storage.hpp
@@ -10,6 +10,7 @@
 #include "../std/map.hpp"
 #include "../std/list.hpp"
 #include "../std/string.hpp"
+#include "../std/set.hpp"
 
 #include <boost/function.hpp>
 
@@ -37,6 +38,14 @@ namespace storage
     {
       return m_group == other.m_group && m_country == other.m_country && m_region == other.m_region;
     }
+    bool operator<(TIndex const & other) const
+    {
+      if (m_group != other.m_group)
+        return m_group < other.m_group;
+      else if (m_country != other.m_country)
+        return m_country < other.m_country;
+      return m_region < other.m_region;
+    }
   };
 
   /// Can be used to store local maps and/or maps available for download
@@ -52,6 +61,10 @@ namespace storage
     /// used to correctly calculate total country download progress
     TDownloadProgress m_countryProgress;
 
+    typedef set<TIndex> TFailedCountries;
+    /// stores countries which download has failed recently
+    TFailedCountries m_failedCountries;
+
     /// @name Communicate with GUI
     //@{
     typedef boost::function<void (TIndex const &)> TObserverChangeCountryFunction;