diff --git a/build.gradle b/build.gradle
index 80103afe..546a3744 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath 'com.novoda:bintray-release:0.8.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/chatkit/build.gradle b/chatkit/build.gradle
index f9b50b7f..9af08079 100644
--- a/chatkit/build.gradle
+++ b/chatkit/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.novoda.bintray-release'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     buildToolsVersion "27.0.3"
 
     defaultConfig {
@@ -19,6 +19,7 @@ android {
 }
 
 publish {
+    userOrg = 'egeniq'
     groupId = 'com.github.stfalcon'
     artifactId = 'chatkit'
     publishVersion = '0.3.3'
@@ -36,7 +37,7 @@ ext {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation "com.android.support:appcompat-v7:$supportVersion"
-    implementation "com.android.support:design:$supportVersion"
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation "com.google.android:flexbox:$flexboxVersion"
 }
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/commons/ImageLoader.java b/chatkit/src/main/java/com/stfalcon/chatkit/commons/ImageLoader.java
index a0f7f44f..9043cb6c 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/commons/ImageLoader.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/commons/ImageLoader.java
@@ -16,7 +16,7 @@
 
 package com.stfalcon.chatkit.commons;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 
 /**
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/commons/Style.java b/chatkit/src/main/java/com/stfalcon/chatkit/commons/Style.java
index fcbd8a77..80489b71 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/commons/Style.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/commons/Style.java
@@ -20,11 +20,11 @@
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.AttrRes;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DimenRes;
-import android.support.annotation.DrawableRes;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DimenRes;
+import androidx.annotation.DrawableRes;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/commons/ViewHolder.java b/chatkit/src/main/java/com/stfalcon/chatkit/commons/ViewHolder.java
index dff3193c..e5451012 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/commons/ViewHolder.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/commons/ViewHolder.java
@@ -16,7 +16,7 @@
 
 package com.stfalcon.chatkit.commons;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/IMessage.java b/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/IMessage.java
index 4605aab3..52beca0e 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/IMessage.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/IMessage.java
@@ -50,4 +50,5 @@ public interface IMessage {
      * @return the message creation date
      */
     Date getCreatedAt();
+
 }
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/MessageContentType.java b/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/MessageContentType.java
index b8f2675a..8737d5c0 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/MessageContentType.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/MessageContentType.java
@@ -16,7 +16,7 @@
 
 package com.stfalcon.chatkit.commons.models;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.stfalcon.chatkit.messages.MessageHolders;
 
 /*
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/dialogs/DialogsList.java b/chatkit/src/main/java/com/stfalcon/chatkit/dialogs/DialogsList.java
index 6336203d..4bb5ff75 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/dialogs/DialogsList.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/dialogs/DialogsList.java
@@ -17,11 +17,11 @@
 package com.stfalcon.chatkit.dialogs;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SimpleItemAnimator;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
 import android.util.AttributeSet;
 
 import com.stfalcon.chatkit.commons.models.IDialog;
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/dialogs/DialogsListAdapter.java b/chatkit/src/main/java/com/stfalcon/chatkit/dialogs/DialogsListAdapter.java
index dc48e7f0..6f255ca9 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/dialogs/DialogsListAdapter.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/dialogs/DialogsListAdapter.java
@@ -18,9 +18,9 @@
 
 import android.graphics.Typeface;
 import android.graphics.drawable.GradientDrawable;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageHolders.java b/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageHolders.java
index c089cbdf..f367647a 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageHolders.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageHolders.java
@@ -1,8 +1,9 @@
 package com.stfalcon.chatkit.messages;
 
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat;
+
 import android.text.Spannable;
 import android.text.method.LinkMovementMethod;
 import android.util.SparseArray;
@@ -564,6 +565,7 @@ protected ViewHolder getHolder(ViewGroup parent, int viewType, MessagesListStyle
 
     @SuppressWarnings("unchecked")
     protected void bind(final ViewHolder holder, final Object item, boolean isSelected,
+                        boolean isContinuous, boolean isLastItemInGroup,
                         final ImageLoader imageLoader,
                         final View.OnClickListener onMessageClickListener,
                         final View.OnLongClickListener onMessageLongClickListener,
@@ -573,6 +575,8 @@ protected void bind(final ViewHolder holder, final Object item, boolean isSelect
         if (item instanceof IMessage) {
             ((MessageHolders.BaseMessageViewHolder) holder).isSelected = isSelected;
             ((MessageHolders.BaseMessageViewHolder) holder).imageLoader = imageLoader;
+            ((BaseMessageViewHolder) holder).isFirstItemInGroup = isContinuous;
+            ((BaseMessageViewHolder) holder).isLastItemInGroup = isLastItemInGroup;
             holder.itemView.setOnLongClickListener(onMessageLongClickListener);
             holder.itemView.setOnClickListener(onMessageClickListener);
 
@@ -676,6 +680,9 @@ public static abstract class BaseMessageViewHolder<MESSAGE extends IMessage> ext
 
         boolean isSelected;
 
+        boolean isFirstItemInGroup;
+
+        boolean isLastItemInGroup;
         /**
          * For setting custom data to ViewHolder
          */
@@ -705,6 +712,31 @@ public boolean isSelected() {
             return isSelected;
         }
 
+        /**
+         * Returns whether item belongs to the same user
+         *
+         * @return weather item belongs to the same user.
+         */
+        public boolean isFirstItemInGroup() {
+            return isFirstItemInGroup;
+        }
+
+        /**
+         * Returns whether the current item and the next belongs to the same user
+         */
+        public boolean isLastItemInGroup() {
+            return isLastItemInGroup;
+        }
+
+        public List<View> getVisibleViewsForFirstItemInGroup() {
+            return new ArrayList<>();
+        }
+
+        public List<View> getVisibleViewsForLastItemInGroup() {
+            return new ArrayList<>();
+        }
+
+
         /**
          * Returns weather is selection mode enabled
          *
@@ -769,6 +801,26 @@ public void onBind(MESSAGE message) {
             if (text != null) {
                 text.setText(message.getText());
             }
+
+            if (isLastItemInGroup()) {
+                for (View continousView : getVisibleViewsForLastItemInGroup()) {
+                    continousView.setVisibility(View.VISIBLE);
+                }
+            } else {
+                for (View continousView : getVisibleViewsForLastItemInGroup()) {
+                    continousView.setVisibility(View.GONE);
+                }
+            }
+
+            if (isFirstItemInGroup()) {
+                for (View continousView : getVisibleViewsForFirstItemInGroup()) {
+                    continousView.setVisibility(View.VISIBLE);
+                }
+            } else {
+                for (View continousView : getVisibleViewsForFirstItemInGroup()) {
+                    continousView.setVisibility(View.INVISIBLE);
+                }
+            }
         }
 
         @Override
@@ -828,6 +880,26 @@ public void onBind(MESSAGE message) {
             if (text != null) {
                 text.setText(message.getText());
             }
+
+            if (isLastItemInGroup()) {
+                for (View continousView : getVisibleViewsForLastItemInGroup()) {
+                    continousView.setVisibility(View.VISIBLE);
+                }
+            } else {
+                for (View continousView : getVisibleViewsForLastItemInGroup()) {
+                    continousView.setVisibility(View.GONE);
+                }
+            }
+
+            if (isFirstItemInGroup()) {
+                for (View continousView : getVisibleViewsForFirstItemInGroup()) {
+                    continousView.setVisibility(View.VISIBLE);
+                }
+            } else {
+                for (View continousView : getVisibleViewsForFirstItemInGroup()) {
+                    continousView.setVisibility(View.INVISIBLE);
+                }
+            }
         }
 
         @Override
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageInput.java b/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageInput.java
index 16e42a35..80383041 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageInput.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageInput.java
@@ -19,8 +19,8 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.Space;
+import androidx.core.view.ViewCompat;
+import androidx.legacy.widget.Space;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageInputStyle.java b/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageInputStyle.java
index 1cea99c8..424e8a14 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageInputStyle.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageInputStyle.java
@@ -20,9 +20,9 @@
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.core.graphics.drawable.DrawableCompat;
 import android.util.AttributeSet;
 
 import com.stfalcon.chatkit.R;
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesList.java b/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesList.java
index 17b3f8ed..5559b38a 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesList.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesList.java
@@ -17,11 +17,11 @@
 package com.stfalcon.chatkit.messages;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SimpleItemAnimator;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
 import android.util.AttributeSet;
 
 import com.stfalcon.chatkit.commons.models.IMessage;
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesListAdapter.java b/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesListAdapter.java
index e0fcb8a2..ec9eed57 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesListAdapter.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesListAdapter.java
@@ -19,8 +19,10 @@
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.support.annotation.LayoutRes;
-import android.support.v7.widget.RecyclerView;
+
+import androidx.annotation.LayoutRes;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.text.Spannable;
 import android.text.method.LinkMovementMethod;
 import android.util.SparseArray;
@@ -34,6 +36,7 @@
 import com.stfalcon.chatkit.commons.ImageLoader;
 import com.stfalcon.chatkit.commons.ViewHolder;
 import com.stfalcon.chatkit.commons.models.IMessage;
+import com.stfalcon.chatkit.commons.models.IUser;
 import com.stfalcon.chatkit.utils.DateFormatter;
 
 import java.util.ArrayList;
@@ -103,13 +106,70 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
         Wrapper wrapper = items.get(position);
-        holders.bind(holder, wrapper.item, wrapper.isSelected, imageLoader,
+        boolean isFirstItemInGroup = true;
+        boolean isLastItemInGroup = true;
+        if (position < items.size() - 1) {
+            isFirstItemInGroup = isFirstItemInGroup(items.get(position), items.get(position + 1));
+        }
+
+        if (position > 0) {
+            isLastItemInGroup = isLastItemInGroup(items.get(position), items.get(position - 1));
+        }
+        holders.bind(holder, wrapper.item, wrapper.isSelected, isFirstItemInGroup, isLastItemInGroup, imageLoader,
                 getMessageClickListener(wrapper),
                 getMessageLongClickListener(wrapper),
                 dateHeadersFormatter,
                 viewClickListenersArray);
     }
 
+    private boolean isFirstItemInGroup(Wrapper currentMsg, Wrapper precedingMsg) {
+        // null check
+        if (currentMsg == null || precedingMsg == null) {
+            return true;
+        }
+
+        IUser currentUser, precedingUser;
+        if (currentMsg.item instanceof IMessage) {
+            currentUser = ((IMessage) currentMsg.item).getUser();
+        } else {
+            return true;
+        }
+        if (precedingMsg.item instanceof IMessage) {
+            precedingUser = ((IMessage) precedingMsg.item).getUser();
+        } else {
+            return true;
+        }
+
+        // If admin message or
+        if (currentUser == null || precedingUser == null) return true;
+        return !(currentUser.getId().equals(precedingUser.getId()));
+    }
+
+    private boolean isLastItemInGroup(Wrapper currentMsg, Wrapper nextMessage) {
+        // null check
+        if (currentMsg == null || nextMessage == null) {
+            return true;
+        }
+
+        IUser currentUser, nextUser;
+        if (currentMsg.item instanceof IMessage) {
+            currentUser = ((IMessage) currentMsg.item).getUser();
+        } else {
+            return true;
+        }
+        if (nextMessage.item instanceof IMessage) {
+            nextUser = ((IMessage) nextMessage.item).getUser();
+        } else {
+            return true;
+        }
+
+        // If admin message or
+        if (currentUser == null || nextUser == null) {
+            return true;
+        }
+        return !currentUser.getId().equals(nextUser.getId());
+    }
+
     @Override
     public int getItemCount() {
         return items.size();
@@ -155,7 +215,11 @@ public void addToStart(MESSAGE message, boolean scroll) {
         }
         Wrapper<MESSAGE> element = new Wrapper<>(message);
         items.add(0, element);
+        boolean isContinuous = isPreviousSameAuthor(message.getUser().getId(), 0);
         notifyItemRangeInserted(0, isNewMessageToday ? 2 : 1);
+        if (isContinuous) {
+            notifyItemChanged(1);
+        }
         if (layoutManager != null && scroll) {
             layoutManager.scrollToPosition(0);
         }
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesListStyle.java b/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesListStyle.java
index 88c6fe15..7bb7182f 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesListStyle.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesListStyle.java
@@ -22,9 +22,9 @@
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.core.graphics.drawable.DrawableCompat;
 import android.util.AttributeSet;
 
 import com.stfalcon.chatkit.R;
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/messages/RecyclerScrollMoreListener.java b/chatkit/src/main/java/com/stfalcon/chatkit/messages/RecyclerScrollMoreListener.java
index 00012084..f6e61998 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/messages/RecyclerScrollMoreListener.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/messages/RecyclerScrollMoreListener.java
@@ -16,10 +16,10 @@
 
 package com.stfalcon.chatkit.messages;
 
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
 class RecyclerScrollMoreListener
         extends RecyclerView.OnScrollListener {
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/utils/RoundedImageView.java b/chatkit/src/main/java/com/stfalcon/chatkit/utils/RoundedImageView.java
index 7770fb13..62954e99 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/utils/RoundedImageView.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/utils/RoundedImageView.java
@@ -18,12 +18,11 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.net.Uri;
-import android.support.annotation.DimenRes;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.annotation.DimenRes;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
-import android.widget.ImageView;
 
 /**
  * Thanks to Joonho Kim (https://github.com/pungrue26) for his lightweight SelectableRoundedImageView,
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/utils/ShapeImageView.java b/chatkit/src/main/java/com/stfalcon/chatkit/utils/ShapeImageView.java
index b9f054c5..f212468a 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/utils/ShapeImageView.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/utils/ShapeImageView.java
@@ -26,7 +26,7 @@
  * ImageView with mask what described with Bézier Curves
  */
 
-public class ShapeImageView extends android.support.v7.widget.AppCompatImageView {
+public class ShapeImageView extends androidx.appcompat.widget.AppCompatImageView {
     private Path path;
 
     public ShapeImageView(Context context) {
diff --git a/chatkit/src/main/res/layout/view_message_input.xml b/chatkit/src/main/res/layout/view_message_input.xml
index aaed1f5f..7f01ac9d 100644
--- a/chatkit/src/main/res/layout/view_message_input.xml
+++ b/chatkit/src/main/res/layout/view_message_input.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"/>
 
-    <android.support.v4.widget.Space
+    <androidx.legacy.widget.Space
         android:id="@id/attachmentButtonSpace"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -28,7 +28,7 @@
         android:layout_toStartOf="@id/sendButtonSpace"
         android:inputType="textAutoCorrect|textAutoComplete|textMultiLine|textCapSentences"/>
 
-    <android.support.v4.widget.Space
+    <androidx.legacy.widget.Space
         android:id="@id/sendButtonSpace"
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/gradle.properties b/gradle.properties
index aac7c9b4..9e6fce10 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d0edd216..b4fca41a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jul 03 14:43:10 EEST 2018
+#Tue Jan 05 11:57:09 WAT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
index dbed4d4e..84efa57e 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 14
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -35,14 +35,14 @@ dependencies {
     implementation project(':chatkit')
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testImplementation 'junit:junit:4.12'
 
-    implementation "com.android.support:appcompat-v7:$supportVersion"
-    implementation "com.android.support:cardview-v7:$supportVersion"
-    implementation "com.android.support:design:$supportVersion"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
 
     //Picasso
     implementation "com.squareup.picasso:picasso:$picassoVersion"
diff --git a/sample/src/androidTest/java/com/stfalcon/chatkit/sample/ExampleInstrumentedTest.java b/sample/src/androidTest/java/com/stfalcon/chatkit/sample/ExampleInstrumentedTest.java
index 9ba761a3..c1e5c0f4 100644
--- a/sample/src/androidTest/java/com/stfalcon/chatkit/sample/ExampleInstrumentedTest.java
+++ b/sample/src/androidTest/java/com/stfalcon/chatkit/sample/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.stfalcon.chatkit.sample;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/sample/src/main/java/com/stfalcon/chatkit/sample/common/data/model/Message.java b/sample/src/main/java/com/stfalcon/chatkit/sample/common/data/model/Message.java
index c24fd039..a458bafd 100644
--- a/sample/src/main/java/com/stfalcon/chatkit/sample/common/data/model/Message.java
+++ b/sample/src/main/java/com/stfalcon/chatkit/sample/common/data/model/Message.java
@@ -18,6 +18,7 @@ public class Message implements IMessage,
     private User user;
     private Image image;
     private Voice voice;
+    private boolean isContinous;
 
     public Message(String id, User user, String text) {
         this(id, user, text, new Date());
diff --git a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/DemoDialogsActivity.java b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/DemoDialogsActivity.java
index 770db5e5..1b2ae46e 100644
--- a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/DemoDialogsActivity.java
+++ b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/DemoDialogsActivity.java
@@ -1,8 +1,8 @@
 package com.stfalcon.chatkit.sample.features.demo;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.ImageView;
 
 import com.squareup.picasso.Picasso;
diff --git a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/DemoMessagesActivity.java b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/DemoMessagesActivity.java
index b58867cb..39b0139f 100644
--- a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/DemoMessagesActivity.java
+++ b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/DemoMessagesActivity.java
@@ -2,8 +2,8 @@
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
diff --git a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomIncomingImageMessageViewHolder.java b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomIncomingImageMessageViewHolder.java
index 124b4cc4..9f6aecfa 100644
--- a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomIncomingImageMessageViewHolder.java
+++ b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomIncomingImageMessageViewHolder.java
@@ -1,5 +1,6 @@
 package com.stfalcon.chatkit.sample.features.demo.custom.holder.holders.messages;
 
+import android.animation.Animator;
 import android.view.View;
 
 import com.stfalcon.chatkit.messages.MessageHolders;
@@ -29,5 +30,13 @@ public void onBind(Message message) {
         } else {
             onlineIndicator.setBackgroundResource(R.drawable.shape_bubble_offline);
         }
+
+        if (isContinuous()) {
+            userAvatar.setVisibility(View.INVISIBLE);
+            onlineIndicator.setVisibility(View.GONE);
+        } else {
+            userAvatar.setVisibility(View.VISIBLE);
+            onlineIndicator.setVisibility(View.VISIBLE);
+        }
     }
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomIncomingTextMessageViewHolder.java b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomIncomingTextMessageViewHolder.java
index a846a840..fe1cc072 100644
--- a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomIncomingTextMessageViewHolder.java
+++ b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomIncomingTextMessageViewHolder.java
@@ -1,5 +1,6 @@
 package com.stfalcon.chatkit.sample.features.demo.custom.holder.holders.messages;
 
+import android.animation.Animator;
 import android.view.View;
 
 import com.stfalcon.chatkit.messages.MessageHolders;
@@ -37,6 +38,13 @@ public void onClick(View view) {
                 }
             }
         });
+        if (isContinuous()) {
+            userAvatar.setVisibility(View.INVISIBLE);
+            onlineIndicator.setVisibility(View.GONE);
+        } else {
+            userAvatar.setVisibility(View.VISIBLE);
+            onlineIndicator.setVisibility(View.VISIBLE);
+        }
     }
 
     public static class Payload {
diff --git a/sample/src/main/java/com/stfalcon/chatkit/sample/features/main/MainActivity.java b/sample/src/main/java/com/stfalcon/chatkit/sample/features/main/MainActivity.java
index 8a49e160..ffb43927 100644
--- a/sample/src/main/java/com/stfalcon/chatkit/sample/features/main/MainActivity.java
+++ b/sample/src/main/java/com/stfalcon/chatkit/sample/features/main/MainActivity.java
@@ -1,8 +1,9 @@
 package com.stfalcon.chatkit.sample.features.main;
 
 import android.os.Bundle;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.viewpager.widget.ViewPager;
 
 import com.stfalcon.chatkit.sample.R;
 import com.stfalcon.chatkit.sample.features.demo.custom.holder.CustomHolderDialogsActivity;
diff --git a/sample/src/main/java/com/stfalcon/chatkit/sample/features/main/adapter/DemoCardFragment.java b/sample/src/main/java/com/stfalcon/chatkit/sample/features/main/adapter/DemoCardFragment.java
index 8d4054fd..a39aaf33 100644
--- a/sample/src/main/java/com/stfalcon/chatkit/sample/features/main/adapter/DemoCardFragment.java
+++ b/sample/src/main/java/com/stfalcon/chatkit/sample/features/main/adapter/DemoCardFragment.java
@@ -2,13 +2,14 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+
 import com.stfalcon.chatkit.sample.R;
 
 /*
diff --git a/sample/src/main/java/com/stfalcon/chatkit/sample/features/main/adapter/MainActivityPagerAdapter.java b/sample/src/main/java/com/stfalcon/chatkit/sample/features/main/adapter/MainActivityPagerAdapter.java
index bfab5867..c1e01097 100644
--- a/sample/src/main/java/com/stfalcon/chatkit/sample/features/main/adapter/MainActivityPagerAdapter.java
+++ b/sample/src/main/java/com/stfalcon/chatkit/sample/features/main/adapter/MainActivityPagerAdapter.java
@@ -1,9 +1,10 @@
 package com.stfalcon.chatkit.sample.features.main.adapter;
 
 import android.content.Context;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import com.stfalcon.chatkit.sample.R;
 
diff --git a/sample/src/main/java/com/stfalcon/chatkit/sample/utils/AppUtils.java b/sample/src/main/java/com/stfalcon/chatkit/sample/utils/AppUtils.java
index 8c914dfd..77e3793c 100644
--- a/sample/src/main/java/com/stfalcon/chatkit/sample/utils/AppUtils.java
+++ b/sample/src/main/java/com/stfalcon/chatkit/sample/utils/AppUtils.java
@@ -1,7 +1,7 @@
 package com.stfalcon.chatkit.sample.utils;
 
 import android.content.Context;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.widget.Toast;
 
 /*
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index a831f0b8..cde1017f 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -1,4 +1,4 @@
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -31,7 +31,7 @@
             android:layout_height="0dp"
             android:layout_weight="3">
 
-            <android.support.v4.view.ViewPager
+            <androidx.viewpager.widget.ViewPager
                 android:id="@+id/pager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -51,4 +51,4 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/fragment_demo_card.xml b/sample/src/main/res/layout/fragment_demo_card.xml
index 87290af0..f20809f1 100644
--- a/sample/src/main/res/layout/fragment_demo_card.xml
+++ b/sample/src/main/res/layout/fragment_demo_card.xml
@@ -1,4 +1,4 @@
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -43,4 +43,4 @@
 
     </RelativeLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/sample/src/main/res/layout/item_custom_incoming_text_message.xml b/sample/src/main/res/layout/item_custom_incoming_text_message.xml
index bc1bbd96..52d52e7c 100644
--- a/sample/src/main/res/layout/item_custom_incoming_text_message.xml
+++ b/sample/src/main/res/layout/item_custom_incoming_text_message.xml
@@ -9,7 +9,7 @@
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@id/messageUserAvatar"
-        android:layout_width="40dp"
+        android:layout_width="20dp"
         android:layout_height="40dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"/>
diff --git a/sample/src/main/res/layout/item_sample.xml b/sample/src/main/res/layout/item_sample.xml
index f970b2e6..8bfce6df 100644
--- a/sample/src/main/res/layout/item_sample.xml
+++ b/sample/src/main/res/layout/item_sample.xml
@@ -1,4 +1,4 @@
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/root"
     android:layout_width="match_parent"
@@ -39,4 +39,4 @@
 
     </RelativeLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file