diff --git a/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.cpp b/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.cpp
index 13e2add..1efcc0f 100644
--- a/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.cpp
+++ b/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.cpp
@@ -1,165 +1,166 @@
 /*
     Copyright 2014  Nilesh Suthar <nileshsuthar@live.in>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
     version 2.1 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "kpeople_chat_plugin.h"
 #include "chatlistviewdelegate.h"
 
 #include <QLabel>
 #include <QDebug>
 #include <QListView>
 #include <QStandardItemModel>
 #include <QVBoxLayout>
 #include <QScrollArea>
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <KLocalizedString>
 #include <KPeople/PersonData>
 
 #include <KTp/core.h>
 #include <KTp/Logger/log-manager.h>
 #include <KTp/Logger/log-entity.h>
 #include <KTp/Logger/pending-logger-dates.h>
 #include <KTp/Logger/pending-logger-logs.h>
 #include <KTp/message.h>
 #include <TelepathyQt/Account>
 #include <TelepathyQt/AccountManager>
 
 #define TP_ACCOUNT_OBJECT_PATH_BASE "/org/freedesktop/Telepathy/Account/"
 
 K_PLUGIN_FACTORY_WITH_JSON(KpeopleChatFactory, "kpeople_chat_plugin.json", registerPlugin<ChatWidgetFactory>();)
 K_EXPORT_PLUGIN(KpeopleChatFactory("kpeople_chat_plugin", "ktp-common-internals"))
 
 ChatWidgetFactory::ChatWidgetFactory(QObject *parent, const QVariantList &args): AbstractFieldWidgetFactory(parent)
 {
     Q_UNUSED(parent);
     Q_UNUSED(args);
     m_model = new QStandardItemModel();
 }
 
 QWidget *ChatWidgetFactory::createDetailsWidget(const KPeople::PersonData &person, QWidget *parent) const
 {
+    QString accountPath = person.contactCustomProperty(QStringLiteral("telepathy-accountPath")).toString();
+    if (accountPath.isNull()) {
+        QLabel *label = new QLabel(i18n("Chat for current contact is not supported"));
+        return label;
+    }
+
     QWidget *widget = new QWidget(parent);
 
     QScrollArea *scrollArea = new QScrollArea();
     scrollArea->setWidget(widget);
     scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     scrollArea->setWidgetResizable(true);
     scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     scrollArea->setFixedHeight(widget->height());
 
     QVBoxLayout *layout = new QVBoxLayout(widget);
     QListView *chatlistView = new QListView();
     ChatListviewDelegate *chatListViewDelegate = new ChatListviewDelegate(chatlistView);
     chatlistView->setItemDelegate(chatListViewDelegate);
     chatlistView->setModel(m_model);
     layout->setContentsMargins(0, 0, 0, 0);
 
-    QString accountPath = person.contactCustomProperty(QStringLiteral("telepathy-accountPath")).toString();
-    if (accountPath.isNull()) {
-        layout->addWidget(new QLabel(i18n("Chat for current contact is not supported")));
-    } else {
-        KTp::LogManager *logManager = KTp::LogManager::instance();
-        logManager->setAccountManager(KTp::accountManager());
-        KTp::LogEntity logEntity(Tp::HandleTypeContact, person.contactCustomProperty(QStringLiteral("telepathy-contactId")).toString());
+    KTp::LogManager *logManager = KTp::LogManager::instance();
+    logManager->setAccountManager(KTp::accountManager());
+    KTp::LogEntity logEntity(Tp::HandleTypeContact, person.contactCustomProperty(QStringLiteral("telepathy-contactId")).toString());
 
-        Tp::AccountPtr account;
+    Tp::AccountPtr account;
 
-        if (accountPath.contains(QLatin1String(TP_ACCOUNT_OBJECT_PATH_BASE))) {
-            account = KTp::accountManager().data()->accountForObjectPath(accountPath);
-        } else {
-            account = KTp::accountManager().data()->accountForObjectPath(QLatin1String(TP_ACCOUNT_OBJECT_PATH_BASE) + accountPath);
-        }
+    if (accountPath.contains(QLatin1String(TP_ACCOUNT_OBJECT_PATH_BASE))) {
+        account = KTp::accountManager().data()->accountForObjectPath(accountPath);
+    } else {
+        account = KTp::accountManager().data()->accountForObjectPath(QLatin1String(TP_ACCOUNT_OBJECT_PATH_BASE) + accountPath);
+    }
 
-        if (account.isNull()) {
-            qDebug() << "Error Occoured Account is not supposed to be null";
+    if (account.isNull()) {
+        qDebug() << "Error Occoured Account is not supposed to be null";
+    } else {
+        if (logManager->logsExist(account, logEntity)) {
+            connect(logManager->queryDates(account, logEntity), SIGNAL(finished(KTp::PendingLoggerOperation*)), SLOT(onPendingDates(KTp::PendingLoggerOperation*)));
         } else {
-            if (logManager->logsExist(account, logEntity)) {
-                connect(logManager->queryDates(account, logEntity), SIGNAL(finished(KTp::PendingLoggerOperation*)), SLOT(onPendingDates(KTp::PendingLoggerOperation*)));
-            } else {
-                layout->addWidget(new QLabel(QLatin1String("Chat for current contact is not available")));
-            }
+            layout->addWidget(new QLabel(QLatin1String("Chat for current contact is not available")));
         }
     }
 
     layout->addWidget(chatlistView);
     widget->setLayout(layout);
 
     return scrollArea;
 }
 void ChatWidgetFactory::onPendingDates(KTp::PendingLoggerOperation *pendingOperation)
 {
 
     KTp::PendingLoggerDates *pd = qobject_cast<KTp::PendingLoggerDates *>(pendingOperation);
     QList<QDate> dates = pd->dates();
     if (dates.isEmpty()) {
         qDebug() << "No messages";
         return;
     }
     //Return atmost 5 logs previous logs
     int numberOfLogs = 5;
     if (dates.count() <= numberOfLogs) {
         Q_FOREACH (QDate date , dates) {
             KTp::PendingLoggerLogs *log = KTp::LogManager::instance()->queryLogs(pd->account(), pd->entity(), date);
             connect(log, SIGNAL(finished(KTp::PendingLoggerOperation*)), this, SLOT(onEventsFinished(KTp::PendingLoggerOperation*)));
         }
     } else {
         for (int i = numberOfLogs; i > 0; i--) {
             KTp::PendingLoggerLogs *log = KTp::LogManager::instance()->queryLogs(pd->account(), pd->entity(), dates[dates.count() - i]);
             connect(log, SIGNAL(finished(KTp::PendingLoggerOperation*)), this, SLOT(onEventsFinished(KTp::PendingLoggerOperation*)));
         }
     }
 }
 
 void ChatWidgetFactory::onEventsFinished(KTp::PendingLoggerOperation *pendingOperation)
 {
     KTp::PendingLoggerLogs *logs = qobject_cast<KTp::PendingLoggerLogs *>(pendingOperation);
     if (logs->hasError()) {
         qDebug() << "Failed to fetch error:" << logs->error();
         return;
     }
     QStringList queuedMessageTokens;
     QList<KTp::LogMessage> messageList = logs->logs();
 
     Q_FOREACH (KTp::LogMessage message, messageList) {
         if (message.direction() == KTp::Message::RemoteToLocal) {
             QStandardItem *messageRow = new QStandardItem();
             messageRow->setData(message.senderAlias(), ChatListviewDelegate::senderAliasRole);
             messageRow->setData(message.mainMessagePart(), ChatListviewDelegate::messageRole);
             messageRow->setData(QLocale().toString(message.time(), QLocale::ShortFormat), ChatListviewDelegate::messageTimeRole);
             m_model->appendRow(messageRow);
         } else {
             QStandardItem *messageRow = new QStandardItem();
             messageRow->setData(QLatin1String("Me"), ChatListviewDelegate::senderAliasRole);
             messageRow->setData(message.mainMessagePart(), ChatListviewDelegate::messageRole);
             messageRow->setData(QLocale().toString(message.time(), QLocale::ShortFormat), ChatListviewDelegate::messageTimeRole);
             m_model->appendRow(messageRow);
         }
     }
 }
 
 QString ChatWidgetFactory::label() const
 {
     return i18n("Chat");
 }
 
 int ChatWidgetFactory::sortWeight() const
 {
     return 0;
 }
 
 #include "kpeople_chat_plugin.moc"