diff --git a/src/pages/messages/messages.ts b/src/pages/messages/messages.ts
index 6f099b99d..47080e968 100644
--- a/src/pages/messages/messages.ts
+++ b/src/pages/messages/messages.ts
@@ -16,11 +16,14 @@ export class MessagesPage implements OnInit, OnDestroy {
   messages: Observable<Message[]>;
   message: string = "";
   autoScroller: MutationObserver;
+  senderId: string;
 
   constructor(navParams: NavParams, element: ElementRef) {
     this.selectedChat = <Chat>navParams.get('chat');
     this.title = this.selectedChat.title;
     this.picture = this.selectedChat.picture;
+    this.senderId = Meteor.userId();
+
   }
 
   private get messagesPageContent(): Element {
@@ -44,15 +47,12 @@ export class MessagesPage implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    let isEven = false;
-
     this.messages = Messages.find(
       {chatId: this.selectedChat._id},
       {sort: {createdAt: 1}}
     ).map((messages: Message[]) => {
       messages.forEach((message: Message) => {
-        message.ownership = isEven ? 'mine' : 'other';
-        isEven = !isEven;
+        message.ownership = this.senderId == message.senderId ? 'mine' : 'other';
       });
 
       return messages;