diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp
index 066eb60..c6dd75d 100644
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@@ -129,24 +129,34 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListWidget *view)
         
         if ((ui->MyZaddr->text().trimmed() == c.second.getAddress()) && (c.second.getMemo().startsWith("{") == false) && (c.second.getMemo().isEmpty() == false)){
             for(auto &p : AddressBook::getInstance()->getAllAddressLabels()){
-             if ((p.getCid() == c.second.getCid())){
-          line+= QString("[") + "Verified Message" + QString("]");     ////Todo: Render a green checkmark instead of QString
-           }else{
+    
+           if ((ui->checkBox->isChecked() == true) && (p.getCid() != c.second.getCid()))
+           {
+
+
+            }else{
 
               // line+= QString("[") + "Warning. Not verified!" + QString("]");
-           }
-        }
+           
+        
         line += QString("[") + myDateTime.toString("dd.MM.yyyy hh:mm:ss ") +  QString("] ");
         line += QString("<") + QString("incoming") + QString("> :\n");
         line += QString(c.second.getMemo()) + QString("\n");      
         view->addItem(line);
-        line ="";       
-        }else{}
+        line ="";  
+        }     
+
+
+        }
+
 
     }
+    
+        }
  
 }
 
+
 void ChatModel::addCid(QString tx, QString cid)
 {
     this->cidMap[tx] = cid;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 2b252e4..f17bfc9 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -39,6 +39,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
  
     ui->setupUi(this);
+    ui->checkBox->setChecked(true);
     logger = new Logger(this, QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite-wallet.log"));
 
     // Status Bar