7 files changed, 5 insertions, 11 deletions
diff --git a/Juick/ViewControllers/ChatViewController.m b/Juick/ViewControllers/ChatViewController.m
index 76635f2..195f178 100644
--- a/Juick/ViewControllers/ChatViewController.m
+++ b/Juick/ViewControllers/ChatViewController.m
@@ -8,8 +8,6 @@
 
 #import "ChatViewController.h"
 
-#import "Juick-Swift.h"
-
 #define kMessageInputInitialHeight 50
 
 @interface ChatViewController ()
diff --git a/Juick/ViewControllers/DialogsViewController.m b/Juick/ViewControllers/DialogsViewController.m
index a1950dc..963a930 100644
--- a/Juick/ViewControllers/DialogsViewController.m
+++ b/Juick/ViewControllers/DialogsViewController.m
@@ -9,7 +9,6 @@
 #import "Chat.h"
 #import "DialogsViewController.h"
 #import "ChatViewController.h"
-#import "Juick-Swift.h"
 
 @interface DialogsViewController()
 
diff --git a/Juick/ViewControllers/FeedViewController.m b/Juick/ViewControllers/FeedViewController.m
index 3575f16..2e194a3 100644
--- a/Juick/ViewControllers/FeedViewController.m
+++ b/Juick/ViewControllers/FeedViewController.m
@@ -9,7 +9,6 @@
 #import "FeedViewController.h"
 #import "ThreadViewController.h"
 #import "BlogViewController.h"
-#import "MessageCell.h"
 #import "LoginViewController.h"
 
 NSString * const UserNotAuthenticatedNotificationName = @"UserNotAuthenticated";
diff --git a/Juick/ViewControllers/MessagesViewController.h b/Juick/ViewControllers/MessagesViewController.h
index 6d2c7e2..55a2bde 100644
--- a/Juick/ViewControllers/MessagesViewController.h
+++ b/Juick/ViewControllers/MessagesViewController.h
@@ -1,5 +1,5 @@
 //
-//  MasterViewController.h
+//  MessagesViewController.h
 //  Juick
 //
 //  Created by Vitaly Takmazov on 26.10.13.
@@ -7,7 +7,9 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "MessageCell.h"
+#import "Message.h"
+
+@protocol MessageCellDelegate;
 
 extern NSString* const messageCellIdentifier;
 
diff --git a/Juick/ViewControllers/MessagesViewController.m b/Juick/ViewControllers/MessagesViewController.m
index 10b7c37..8563fca 100644
--- a/Juick/ViewControllers/MessagesViewController.m
+++ b/Juick/ViewControllers/MessagesViewController.m
@@ -7,7 +7,6 @@
 //
 
 #import "MessagesViewController.h"
-#import "MessageCell.h"
 
 #import "Message.h"
 
@@ -156,7 +155,7 @@ NSString* const messageCellIdentifier = @"messageCell";
     } else {
         Message *msg = [self.messages objectAtIndex:indexPath.row];
         MessageCell *cell = [tableView dequeueReusableCellWithIdentifier:messageCellIdentifier forIndexPath:indexPath];
-        [cell configureWithMessage:msg selectable:self.shouldAllowToSelectText];
+        [cell configureWithMsg:msg selectable:self.shouldAllowToSelectText];
         cell.delegate = self;
         return cell;
     }
diff --git a/Juick/ViewControllers/NewPostViewController.m b/Juick/ViewControllers/NewPostViewController.m
index 4ab1c0b..0fc5fd7 100644
--- a/Juick/ViewControllers/NewPostViewController.m
+++ b/Juick/ViewControllers/NewPostViewController.m
@@ -10,8 +10,6 @@
 #import "MessagesViewController.h"
 #import "User+UIView.h"
 
-#import "Juick-Swift.h"
-
 NSString * const NewMessageNotificationName = @"NewMessage";
 NSString * const ReplyPostedNotificationName = @"ReplyPosted";
 
diff --git a/Juick/ViewControllers/ThreadViewController.m b/Juick/ViewControllers/ThreadViewController.m
index fd754cf..4baeabf 100644
--- a/Juick/ViewControllers/ThreadViewController.m
+++ b/Juick/ViewControllers/ThreadViewController.m
@@ -8,7 +8,6 @@
 
 #import "ThreadViewController.h"
 #import "NewPostViewController.h"
-#import "MessageCell.h"
 
 @implementation ThreadViewController