diff --git a/src/CallModel.h b/src/CallModel.h
index e1e03a73474497f3b6ab486705a89449d391ff7c..7e7da8a3b2e345cbab13dbcf2445c4861f16c92f 100644
--- a/src/CallModel.h
+++ b/src/CallModel.h
@@ -91,7 +91,8 @@ class LIB_EXPORT CallModel {
       void removeConference(Call* call);
       void removeCall(Call* call);
       
-      QStringList getHistory();
+      const QHash<QString, Call*> getHistory();
+      QStringList getHistoryCallId();
 
       //Account related members
       static Account* getCurrentAccount();
diff --git a/src/CallModel.hpp b/src/CallModel.hpp
index e4e68a554e25c7954084642d330a6f2850f3f712..98a8782e15a2ceef4ab47462bb9b4f4b47cd1d31 100644
--- a/src/CallModel.hpp
+++ b/src/CallModel.hpp
@@ -73,10 +73,11 @@ template<typename CallWidget, typename Index> bool CallModel<CallWidget,Index>::
    if (!historyInit) {
       ConfigurationManagerInterface& configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
       QStringList historyMap = configurationManager.getHistory().value();
-      qDebug() << "\n\n\n\n\n\n\n\nCall History = " << historyMap<<"\n\n\n\n\n\n";
+      qDebug() << "\n\n\n\n\n\n\n\nCall History = " ;
       foreach (QString historyCallId, historyMap) {
          QStringList param = historyCallId.split("|");
-         if (param.count() < 10) {
+         qDebug() << "Param count" << param.size();
+         if (param.count() <= 10) {
             //If this ever change, look at the gnome client
             QString history_state = param[0];
             QString peer_number   = param[1];
@@ -344,7 +345,7 @@ template<typename CallWidget, typename Index> void CallModel<CallWidget,Index>::
  ****************************************************************************/
 
 ///Return a list of all previous calls
-template<typename CallWidget, typename Index> QStringList CallModel<CallWidget,Index>::getHistory() 
+template<typename CallWidget, typename Index> QStringList CallModel<CallWidget,Index>::getHistoryCallId() 
 {
    QStringList toReturn;
    foreach(Call* call, historyCalls) {
@@ -353,6 +354,11 @@ template<typename CallWidget, typename Index> QStringList CallModel<CallWidget,I
    return toReturn;
 }
 
+template<typename CallWidget, typename Index> const QHash<QString, Call*> CallModel<CallWidget,Index>::getHistory()
+{
+   return historyCalls;
+}
+
 /*****************************************************************************
  *                                                                           *
  *                           Account related code                            *