@@ -9,10 +9,14 @@ class Xmpp.Views.Chat.MessageView extends Backbone.View

     @user = parts.user

     @dateSent = parts.date

+    @fromMe = parts.fromMe

     @message = parts.message

   render: ->

     $(@el).html(@template(username: @user.get('name'), avatar: @user.get('avatar'), date: @formatTime(), message: @message))

+    if @fromMe

+      $(@el).addClass('me')

+

     return this

   formatTime:  ->

@@ -71,10 +71,10 @@ class Xmpp.Views.Chat.WindowView extends Backbone.View

 #    @log(eventView) if logMe == true

   appendMessage: (user, date, msg) ->

-    messageView = new Xmpp.Views.Chat.MessageView(user: user, date: date, message: msg)

+    messageView = new Xmpp.Views.Chat.MessageView(user: user, date: date, message: msg, fromMe: user.get('jid') == App.Models.me.get('jid'))

     $(@el).find('.messages').append(messageView.render().el)

-    App.UI.resizeMessages()

     @log(messageView)

+    Backbone.Events.trigger('resizeWorkspace')

   log: (view) ->

     if (@historyStack.length + 1 >= @maxHistoryLength)

@@ -166,10 +166,8 @@

   .avatar {

     float: left;

-

     height: 32px;

     width: 32px;

-

     margin-right: 8px;

     &.bigger {

@@ -214,7 +212,7 @@

     img {

       height: 32px;

-

+      border-radius: 5px;

       margin: 0 auto;

       display: block;

     }

@@ -503,7 +501,7 @@

   }

   .message-box {

-    width: 75%;

+    width: 580px;

     color: #393939;

     background: $bg-roster;

     border: 1px solid $gray-light;

@@ -513,6 +511,11 @@

     margin-left: 45px;

     position: relative;

+    &.me {

+      border-right: 4px solid $app-color;

+      width: 577px;

+    }

+

     &::after, &::before {

       content: '';

       display: block;