diff --git a/daemon/src/history/historynamecache.cpp b/daemon/src/history/historynamecache.cpp
index 24ec499da08fdedc5aa50626565c2cb7a451cf08..828448b28b79457c365cd35bf48d61c6f32a7aef 100644
--- a/daemon/src/history/historynamecache.cpp
+++ b/daemon/src/history/historynamecache.cpp
@@ -39,10 +39,10 @@ HistoryNameCache::HistoryNameCache() : hNameCache_()
 
     typedef vector<map<string, string> > HistoryList;
     HistoryList history(Manager::instance().getHistory());
-    for (HistoryList::iterator i = history.begin(); i != history.end(); ++i) {
-        string name((*i)["display_name"]);
-        string account((*i)["accountid"]);
-        string number((*i)["peer_number"]);
+    for (auto &i : history) {
+        string name(i["display_name"]);
+        string account(i["accountid"]);
+        string number(i["peer_number"]);
         if (hNameCache_[account][number].empty() and not name.empty() and not number.empty())
             hNameCache_[account][number] = name;
     }