diff --git a/MediaServiceCore b/MediaServiceCore
index e50123eb3..a6288632b 160000
--- a/MediaServiceCore
+++ b/MediaServiceCore
@@ -1 +1 @@
-Subproject commit e50123eb36216bf0d4e738483ad9533a346572b1
+Subproject commit a6288632b60a3fad2454fee58b2d3c21369e8d12
diff --git a/chatkit/src/main/res/values/dimens.xml b/chatkit/src/main/res/values/dimens.xml
index c591e2d8f..859ddd548 100644
--- a/chatkit/src/main/res/values/dimens.xml
+++ b/chatkit/src/main/res/values/dimens.xml
@@ -31,6 +31,8 @@
     <dimen name="message_time_text_size">14sp</dimen>
     <dimen name="message_date_header_text_size">16sp</dimen>
     <dimen name="message_date_header_padding">16dp</dimen>
-    <dimen name="message_incoming_bubble_margin_right">40dp</dimen>
+    <!--<dimen name="message_incoming_bubble_margin_right">40dp</dimen>-->
+    <!-- Make messages to stick exactly to the right edge -->
+    <dimen name="message_incoming_bubble_margin_right">0dp</dimen>
     <dimen name="message_outcoming_bubble_margin_left">88dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/smarttubetv/src/main/res/layout/lb_playback_fragment.xml b/smarttubetv/src/main/res/layout/lb_playback_fragment.xml
index 418daf96c..694c4d698 100644
--- a/smarttubetv/src/main/res/layout/lb_playback_fragment.xml
+++ b/smarttubetv/src/main/res/layout/lb_playback_fragment.xml
@@ -28,7 +28,7 @@
 
     <LinearLayout
         android:id="@+id/live_chat_wrapper"
-        android:layout_width="450sp"
+        android:layout_width="300sp"
         android:layout_height="match_parent"
         android:layout_gravity="right">
         <com.liskovsoft.smartyoutubetv2.tv.ui.widgets.chat.LiveChatView