diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/WrapWidthTextView.kt b/vector/src/main/java/im/vector/riotx/core/ui/views/WrapWidthTextView.kt
new file mode 100644
index 0000000000..aaf1ee3030
--- /dev/null
+++ b/vector/src/main/java/im/vector/riotx/core/ui/views/WrapWidthTextView.kt
@@ -0,0 +1,37 @@
+/*
+ * https://stackoverflow.com/questions/7439748/why-is-wrap-content-in-multiple-line-textview-filling-parent
+ */
+
+package im.vector.riotx.core.ui.views;
+
+import android.content.Context
+import android.text.Layout
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
+import kotlin.math.ceil
+
+class WrapWidthTextView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : AppCompatTextView(context, attrs, defStyleAttr) {
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+        val layout = this.layout ?: return
+        val width = ceil(getMaxLineWidth(layout)).toInt() + compoundPaddingLeft + compoundPaddingRight
+        val height = measuredHeight
+        setMeasuredDimension(width, height)
+    }
+
+    private fun getMaxLineWidth(layout: Layout): Float {
+        var maxWidth = 0.0f
+        val lines = layout.lineCount
+        for (i in 0 until lines) {
+            if (layout.getLineWidth(i) > maxWidth) {
+                maxWidth = layout.getLineWidth(i)
+            }
+        }
+        return maxWidth
+    }
+}
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index ffb71a38c5..96cfcaf7cd 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -397,6 +397,8 @@ class MessageItemFactory @Inject constructor(
                 .leftGuideline(avatarSizeProvider.leftGuideline)
                 .attributes(attributes)
                 .highlighted(highlight)
+                .outgoingMessage(informationData.sentByMe)
+                .incomingMessage(!informationData.sentByMe)
                 .movementMethod(createLinkMovementMethod(callback))
     }
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt
index fabdf22d14..e544576cfb 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt
@@ -16,14 +16,24 @@
 
 package im.vector.riotx.features.home.room.detail.timeline.item
 
+import android.content.res.ColorStateList
 import android.text.method.MovementMethod
+import android.view.Gravity
+import android.widget.FrameLayout
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.content.ContextCompat
 import androidx.core.text.PrecomputedTextCompat
 import androidx.core.widget.TextViewCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.riotx.R
 import im.vector.riotx.features.home.room.detail.timeline.tools.findPillsAndProcess
+import im.vector.riotx.features.themes.BubbleThemeUtils
+import im.vector.riotx.features.themes.BubbleThemeUtils.BUBBLE_STYLE_BOTH
+import im.vector.riotx.features.themes.BubbleThemeUtils.BUBBLE_STYLE_NONE
+import im.vector.riotx.features.themes.BubbleThemeUtils.BUBBLE_STYLE_START
+import im.vector.riotx.features.themes.ThemeUtils
+import kotlin.math.round
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
@@ -36,6 +46,10 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
     var useBigFont: Boolean = false
     @EpoxyAttribute
     var movementMethod: MovementMethod? = null
+    @EpoxyAttribute
+    var incomingMessage: Boolean = false
+    @EpoxyAttribute
+    var outgoingMessage: Boolean = false
 
     override fun bind(holder: Holder) {
         super.bind(holder)
@@ -56,6 +70,35 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
                 TextViewCompat.getTextMetricsParams(holder.messageView),
                 null)
         holder.messageView.setTextFuture(textFuture)
+
+        var bubbleStyle = if (incomingMessage || outgoingMessage) BubbleThemeUtils.getBubbleStyle(holder.messageView.context) else BUBBLE_STYLE_NONE
+        when (bubbleStyle) {
+            BUBBLE_STYLE_NONE -> {
+                holder.messageView.background = null
+                holder.messageView.setPadding(0, 0, 0, 0)
+            }
+            BUBBLE_STYLE_START, BUBBLE_STYLE_BOTH -> {
+                holder.messageView.setBackgroundResource(R.drawable.msg_bubble_incoming)
+                var tintColor = ColorStateList(
+                        arrayOf(intArrayOf(0)),
+                        intArrayOf(ThemeUtils.getColor(holder.messageView.context,
+                                if (outgoingMessage) R.attr.sc_message_bg_outgoing else R.attr.sc_message_bg_incoming)
+                        )
+                )
+                holder.messageView.backgroundTintList = tintColor
+                val density = holder.messageView.resources.displayMetrics.density
+                holder.messageView.setPaddingRelative(
+                        round(20*density).toInt(),
+                        round(8*density).toInt(),
+                        round(8*density).toInt(),
+                        round(8*density).toInt()
+                )
+            }
+        }
+        if (holder.messageView.layoutParams is FrameLayout.LayoutParams) {
+            (holder.messageView.layoutParams as FrameLayout.LayoutParams).gravity =
+                    if (outgoingMessage && bubbleStyle == BUBBLE_STYLE_BOTH) Gravity.END else Gravity.START
+        }
     }
 
     override fun getViewType() = STUB_ID
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt
index 9c240ad093..26f114cd44 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt
@@ -28,6 +28,7 @@ import im.vector.riotx.R
 import im.vector.riotx.core.preference.VectorListPreference
 import im.vector.riotx.core.preference.VectorPreference
 import im.vector.riotx.features.configuration.VectorConfiguration
+import im.vector.riotx.features.themes.BubbleThemeUtils
 import im.vector.riotx.features.themes.ThemeUtils
 import javax.inject.Inject
 
@@ -66,6 +67,11 @@ class VectorSettingsPreferencesFragment @Inject constructor(
                 false
             }
         }
+        findPreference<VectorListPreference>(BubbleThemeUtils.BUBBLE_STYLE_KEY)!!
+                .onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, _ ->
+            BubbleThemeUtils.invalidateBubbleStyle()
+            true
+        }
 
         // Url preview
         findPreference<SwitchPreference>(VectorPreferences.SETTINGS_SHOW_URL_PREVIEW_KEY)!!.let {
diff --git a/vector/src/main/java/im/vector/riotx/features/themes/BubbleThemeUtils.kt b/vector/src/main/java/im/vector/riotx/features/themes/BubbleThemeUtils.kt
new file mode 100644
index 0000000000..bf765d0f94
--- /dev/null
+++ b/vector/src/main/java/im/vector/riotx/features/themes/BubbleThemeUtils.kt
@@ -0,0 +1,27 @@
+package im.vector.riotx.features.themes
+
+import android.content.Context
+import androidx.preference.PreferenceManager
+
+/**
+ * Util class for managing themes.
+ */
+object BubbleThemeUtils {
+    const val BUBBLE_STYLE_KEY = "BUBBLE_STYLE_KEY"
+
+    const val BUBBLE_STYLE_NONE = "none"
+    const val BUBBLE_STYLE_START = "start"
+    const val BUBBLE_STYLE_BOTH = "both"
+    private var mBubbleStyle: String = ""
+
+    fun getBubbleStyle(context: Context): String {
+        if (mBubbleStyle == "") {
+            mBubbleStyle = PreferenceManager.getDefaultSharedPreferences(context).getString(BUBBLE_STYLE_KEY, BUBBLE_STYLE_START)!!
+        }
+        return mBubbleStyle
+    }
+
+    fun invalidateBubbleStyle() {
+        mBubbleStyle = ""
+    }
+}
diff --git a/vector/src/main/res/drawable-hdpi/msg_bubble_incoming.9.png b/vector/src/main/res/drawable-hdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000000..7fed0a806a
Binary files /dev/null and b/vector/src/main/res/drawable-hdpi/msg_bubble_incoming.9.png differ
diff --git a/vector/src/main/res/drawable-ldrtl-hdpi/msg_bubble_incoming.9.png b/vector/src/main/res/drawable-ldrtl-hdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000000..8e7ccc0cc8
Binary files /dev/null and b/vector/src/main/res/drawable-ldrtl-hdpi/msg_bubble_incoming.9.png differ
diff --git a/vector/src/main/res/drawable-ldrtl-mdpi/msg_bubble_incoming.9.png b/vector/src/main/res/drawable-ldrtl-mdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000000..5ca9b14d64
Binary files /dev/null and b/vector/src/main/res/drawable-ldrtl-mdpi/msg_bubble_incoming.9.png differ
diff --git a/vector/src/main/res/drawable-ldrtl-xhdpi/msg_bubble_incoming.9.png b/vector/src/main/res/drawable-ldrtl-xhdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000000..52cb936a8e
Binary files /dev/null and b/vector/src/main/res/drawable-ldrtl-xhdpi/msg_bubble_incoming.9.png differ
diff --git a/vector/src/main/res/drawable-ldrtl-xxhdpi/msg_bubble_incoming.9.png b/vector/src/main/res/drawable-ldrtl-xxhdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000000..5d8fc747ee
Binary files /dev/null and b/vector/src/main/res/drawable-ldrtl-xxhdpi/msg_bubble_incoming.9.png differ
diff --git a/vector/src/main/res/drawable-ldrtl-xxxhdpi/msg_bubble_incoming.9.png b/vector/src/main/res/drawable-ldrtl-xxxhdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000000..8378db5767
Binary files /dev/null and b/vector/src/main/res/drawable-ldrtl-xxxhdpi/msg_bubble_incoming.9.png differ
diff --git a/vector/src/main/res/drawable-mdpi/msg_bubble_incoming.9.png b/vector/src/main/res/drawable-mdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000000..4e7e464037
Binary files /dev/null and b/vector/src/main/res/drawable-mdpi/msg_bubble_incoming.9.png differ
diff --git a/vector/src/main/res/drawable-xhdpi/msg_bubble_incoming.9.png b/vector/src/main/res/drawable-xhdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000000..0661fdba78
Binary files /dev/null and b/vector/src/main/res/drawable-xhdpi/msg_bubble_incoming.9.png differ
diff --git a/vector/src/main/res/drawable-xxhdpi/msg_bubble_incoming.9.png b/vector/src/main/res/drawable-xxhdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000000..ab693b3e7c
Binary files /dev/null and b/vector/src/main/res/drawable-xxhdpi/msg_bubble_incoming.9.png differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/msg_bubble_incoming.9.png b/vector/src/main/res/drawable-xxxhdpi/msg_bubble_incoming.9.png
new file mode 100644
index 0000000000..34130fc6d1
Binary files /dev/null and b/vector/src/main/res/drawable-xxxhdpi/msg_bubble_incoming.9.png differ
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 3ae80424cc..05d0dd797e 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -92,6 +92,7 @@
             android:id="@+id/messageContentTextStub"
             style="@style/TimelineContentStubBaseParams"
             android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
             android:inflatedId="@id/messageTextView"
             android:layout="@layout/item_timeline_event_text_message_stub"
             tools:visibility="visible" />
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
index 59396db0e5..6b8f08833c 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<im.vector.riotx.core.ui.views.WrapWidthTextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/messageTextView"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:textColor="?riotx_text_primary"
     android:textSize="14sp"
diff --git a/vector/src/main/res/values-de/strings_sc.xml b/vector/src/main/res/values-de/strings_sc.xml
index 38f792c3ae..70bf5c0a56 100644
--- a/vector/src/main/res/values-de/strings_sc.xml
+++ b/vector/src/main/res/values-de/strings_sc.xml
@@ -3,4 +3,9 @@
 
     <string name="redacted_stub_text">(Gelöschte Nachricht)</string>
 
+    <string name="bubble_style">Nachrichtblasen</string>
+    <string name="bubble_style_none">Keine</string>
+    <string name="bubble_style_start">Selbe Seite</string>
+    <string name="bubble_style_both">Beide Seiten</string>
+
 </resources>
diff --git a/vector/src/main/res/values/arrays_sc.xml b/vector/src/main/res/values/arrays_sc.xml
new file mode 100644
index 0000000000..2c5305c28e
--- /dev/null
+++ b/vector/src/main/res/values/arrays_sc.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="bubble_style_entries" translatable="false">
+        <item>@string/bubble_style_none</item>
+        <item>@string/bubble_style_start</item>
+        <item>@string/bubble_style_both</item>
+    </string-array>
+    <string-array name="bubble_style_values" translatable="false">
+        <item>none</item>
+        <item>start</item>
+        <item>both</item>
+    </string-array>
+
+</resources>
diff --git a/vector/src/main/res/values/attrs_sc.xml b/vector/src/main/res/values/attrs_sc.xml
new file mode 100644
index 0000000000..cafd386c83
--- /dev/null
+++ b/vector/src/main/res/values/attrs_sc.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="VectorStylesSC">
+
+        <attr name="sc_message_bg_incoming" format="color" />
+        <attr name="sc_message_bg_outgoing" format="color" />
+
+    </declare-styleable>
+
+</resources>
diff --git a/vector/src/main/res/values/strings_sc.xml b/vector/src/main/res/values/strings_sc.xml
index a24b245bc8..abc94df2b8 100644
--- a/vector/src/main/res/values/strings_sc.xml
+++ b/vector/src/main/res/values/strings_sc.xml
@@ -3,4 +3,9 @@
 
     <string name="redacted_stub_text">(Deleted message)</string>
 
+    <string name="bubble_style">Message bubbles</string>
+    <string name="bubble_style_none">None</string>
+    <string name="bubble_style_start">Same side</string>
+    <string name="bubble_style_both">Both sides</string>
+
 </resources>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index a2be367e55..384d693562 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -216,6 +216,9 @@
         <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
         <!-- Style to use for message text within a SnackBar in this theme. -->
         <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
+
+        <item name="sc_message_bg_incoming">#FF465561</item>
+        <item name="sc_message_bg_outgoing">#FF1A2027</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 9709172f9d..9df4bed758 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -216,6 +216,9 @@
         <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
         <!-- Style to use for message text within a SnackBar in this theme. -->
         <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
+
+        <item name="sc_message_bg_incoming">#FF999999</item>
+        <item name="sc_message_bg_outgoing">#FFC7C7C7</item>
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.Base.Light" />
diff --git a/vector/src/main/res/values/theme_sc.xml b/vector/src/main/res/values/theme_sc.xml
index dfd89a0b29..45ba957e2f 100644
--- a/vector/src/main/res/values/theme_sc.xml
+++ b/vector/src/main/res/values/theme_sc.xml
@@ -203,6 +203,9 @@
         <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
         <!-- Style to use for message text within a SnackBar in this theme. -->
         <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
+
+        <item name="sc_message_bg_incoming">@color/background_floating_sc</item>
+        <item name="sc_message_bg_outgoing">@color/accent_sc_alpha25</item>
     </style>
 
     <style name="AppTheme.SC" parent="AppTheme.Base.SC" />
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index 47a344d452..765f015186 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -21,6 +21,15 @@
             android:title="@string/settings_theme"
             app:iconSpaceReserved="false" />
 
+        <im.vector.riotx.core.preference.VectorListPreference
+            android:defaultValue="start"
+            android:entries="@array/bubble_style_entries"
+            android:entryValues="@array/bubble_style_values"
+            android:key="BUBBLE_STYLE_KEY"
+            android:summary="%s"
+            android:title="@string/bubble_style"
+            app:iconSpaceReserved="false" />
+
         <im.vector.riotx.core.preference.VectorPreference
             android:dialogTitle="@string/font_size"
             android:key="SETTINGS_INTERFACE_TEXT_SIZE_KEY"