diff --git a/Yep/ViewControllers/Conversations/ConversationsViewController.swift b/Yep/ViewControllers/Conversations/ConversationsViewController.swift
index fd772778..6cab1a15 100644
--- a/Yep/ViewControllers/Conversations/ConversationsViewController.swift
+++ b/Yep/ViewControllers/Conversations/ConversationsViewController.swift
@@ -75,6 +75,8 @@ class ConversationsViewController: UIViewController {
 
         realm = try! Realm()
 
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: "reloadConversationsTableView", name: YepConfig.Notification.newMessages, object: nil)
+
         NSNotificationCenter.defaultCenter().addObserver(self, selector: "reloadConversationsTableView", name: YepConfig.Notification.changedConversation, object: nil)
 
         NSNotificationCenter.defaultCenter().addObserver(self, selector: "reloadConversationsTableView", name: YepConfig.Notification.markAsReaded, object: nil)
diff --git a/Yep/Views/Cells/Conversation/ConversationCell.swift b/Yep/Views/Cells/Conversation/ConversationCell.swift
index 982b28f6..5efc8407 100644
--- a/Yep/Views/Cells/Conversation/ConversationCell.swift
+++ b/Yep/Views/Cells/Conversation/ConversationCell.swift
@@ -36,7 +36,7 @@ class ConversationCell: UITableViewCell {
 
     deinit {
 
-        NSNotificationCenter.defaultCenter().removeObserver(self)
+        //NSNotificationCenter.defaultCenter().removeObserver(self)
     }
     
     override func awakeFromNib() {
@@ -45,7 +45,7 @@ class ConversationCell: UITableViewCell {
         avatarImageView.contentMode = .ScaleAspectFill
         avatarImageViewWidthConstraint.constant = YepConfig.ConversationCell.avatarSize
 
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "updateUIButAvatar:", name: YepConfig.Notification.newMessages, object: nil)
+        //NSNotificationCenter.defaultCenter().addObserver(self, selector: "updateUIButAvatar:", name: YepConfig.Notification.newMessages, object: nil)
     }
 
     override func setSelected(selected: Bool, animated: Bool) {
@@ -54,11 +54,11 @@ class ConversationCell: UITableViewCell {
         // Configure the view for the selected state
     }
 
-    func updateUIButAvatar(sender: NSNotification) {
-
-        updateCountOfUnreadMessages()
-        updateInfoLabels()
-    }
+//    func updateUIButAvatar(sender: NSNotification) {
+//
+//        updateCountOfUnreadMessages()
+//        updateInfoLabels()
+//    }
 
     private func updateCountOfUnreadMessages() {
 
diff --git a/Yep/Views/Cells/FeedConversationDock/FeedConversationDockCell.swift b/Yep/Views/Cells/FeedConversationDock/FeedConversationDockCell.swift
index f5567c0f..4a3a85ad 100644
--- a/Yep/Views/Cells/FeedConversationDock/FeedConversationDockCell.swift
+++ b/Yep/Views/Cells/FeedConversationDock/FeedConversationDockCell.swift
@@ -26,7 +26,6 @@ class FeedConversationDockCell: UITableViewCell {
         super.awakeFromNib()
 
         nameLabel.text = NSLocalizedString("Joined Feeds", comment: "")
-
         accessoryImageView.tintColor = UIColor.yepCellAccessoryImageViewTintColor()
     }
 
@@ -35,5 +34,5 @@ class FeedConversationDockCell: UITableViewCell {
 
         // Configure the view for the selected state
     }
-    
 }
+
diff --git a/Yep/Views/Feed/FeedMediaView.swift b/Yep/Views/Feed/FeedMediaView.swift
index c3680ad2..a063294e 100644
--- a/Yep/Views/Feed/FeedMediaView.swift
+++ b/Yep/Views/Feed/FeedMediaView.swift
@@ -110,6 +110,7 @@ class FeedMediaView: UIView {
             imageView2.image = nil
             imageView3.image = nil
             imageView4.image = nil
+
         default:
             break
         }