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 0437b54b..4fce59d3 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageHolders.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageHolders.java
@@ -655,12 +655,13 @@ public static abstract class BaseMessageViewHolder<MESSAGE extends IMessage> ext
          */
         protected ImageLoader imageLoader;
 
+        @Deprecated
         public BaseMessageViewHolder(View itemView) {
             super(itemView);
         }
 
         public BaseMessageViewHolder(View itemView, Object payload) {
-            this(itemView);
+            super(itemView);
             this.payload = payload;
         }
 
@@ -717,6 +718,7 @@ public static class IncomingTextMessageViewHolder<MESSAGE extends IMessage>
         protected ViewGroup bubble;
         protected TextView text;
 
+        @Deprecated
         public IncomingTextMessageViewHolder(View itemView) {
             super(itemView);
             init(itemView);
@@ -775,6 +777,7 @@ public static class OutcomingTextMessageViewHolder<MESSAGE extends IMessage>
         protected ViewGroup bubble;
         protected TextView text;
 
+        @Deprecated
         public OutcomingTextMessageViewHolder(View itemView) {
             super(itemView);
             init(itemView);
@@ -833,6 +836,7 @@ public static class IncomingImageMessageViewHolder<MESSAGE extends MessageConten
         protected ImageView image;
         protected View imageOverlay;
 
+        @Deprecated
         public IncomingImageMessageViewHolder(View itemView) {
             super(itemView);
             init(itemView);
@@ -893,6 +897,7 @@ public static class OutcomingImageMessageViewHolder<MESSAGE extends MessageConte
         protected ImageView image;
         protected View imageOverlay;
 
+        @Deprecated
         public OutcomingImageMessageViewHolder(View itemView) {
             super(itemView);
             init(itemView);
@@ -991,6 +996,7 @@ public abstract static class BaseIncomingMessageViewHolder<MESSAGE extends IMess
         protected TextView time;
         protected ImageView userAvatar;
 
+        @Deprecated
         public BaseIncomingMessageViewHolder(View itemView) {
             super(itemView);
             init(itemView);
@@ -1048,6 +1054,7 @@ public abstract static class BaseOutcomingMessageViewHolder<MESSAGE extends IMes
 
         protected TextView time;
 
+        @Deprecated
         public BaseOutcomingMessageViewHolder(View itemView) {
             super(itemView);
             init(itemView);
@@ -1091,7 +1098,7 @@ private static class DefaultIncomingTextMessageViewHolder
             extends IncomingTextMessageViewHolder<IMessage> {
 
         public DefaultIncomingTextMessageViewHolder(View itemView) {
-            super(itemView);
+            super(itemView, null);
         }
     }
 
@@ -1099,7 +1106,7 @@ private static class DefaultOutcomingTextMessageViewHolder
             extends OutcomingTextMessageViewHolder<IMessage> {
 
         public DefaultOutcomingTextMessageViewHolder(View itemView) {
-            super(itemView);
+            super(itemView, null);
         }
     }
 
@@ -1107,7 +1114,7 @@ private static class DefaultIncomingImageMessageViewHolder
             extends IncomingImageMessageViewHolder<MessageContentType.Image> {
 
         public DefaultIncomingImageMessageViewHolder(View itemView) {
-            super(itemView);
+            super(itemView, null);
         }
     }
 
@@ -1115,7 +1122,7 @@ private static class DefaultOutcomingImageMessageViewHolder
             extends OutcomingImageMessageViewHolder<MessageContentType.Image> {
 
         public DefaultOutcomingImageMessageViewHolder(View itemView) {
-            super(itemView);
+            super(itemView, null);
         }
     }
 
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 47e9282a..124b4cc4 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
@@ -14,8 +14,8 @@ public class CustomIncomingImageMessageViewHolder
 
     private View onlineIndicator;
 
-    public CustomIncomingImageMessageViewHolder(View itemView) {
-        super(itemView);
+    public CustomIncomingImageMessageViewHolder(View itemView, Object payload) {
+        super(itemView, payload);
         onlineIndicator = itemView.findViewById(R.id.onlineIndicator);
     }
 
diff --git a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomOutcomingImageMessageViewHolder.java b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomOutcomingImageMessageViewHolder.java
index 36a22359..9b520b85 100644
--- a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomOutcomingImageMessageViewHolder.java
+++ b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomOutcomingImageMessageViewHolder.java
@@ -11,8 +11,8 @@
 public class CustomOutcomingImageMessageViewHolder
         extends MessageHolders.OutcomingImageMessageViewHolder<Message> {
 
-    public CustomOutcomingImageMessageViewHolder(View itemView) {
-        super(itemView);
+    public CustomOutcomingImageMessageViewHolder(View itemView, Object payload) {
+        super(itemView, payload);
     }
 
     @Override
diff --git a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomOutcomingTextMessageViewHolder.java b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomOutcomingTextMessageViewHolder.java
index 81c319d2..aa3a445b 100644
--- a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomOutcomingTextMessageViewHolder.java
+++ b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/holder/holders/messages/CustomOutcomingTextMessageViewHolder.java
@@ -8,8 +8,8 @@
 public class CustomOutcomingTextMessageViewHolder
         extends MessageHolders.OutcomingTextMessageViewHolder<Message> {
 
-    public CustomOutcomingTextMessageViewHolder(View itemView) {
-        super(itemView);
+    public CustomOutcomingTextMessageViewHolder(View itemView, Object payload) {
+        super(itemView, payload);
     }
 
     @Override
diff --git a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/media/holders/IncomingVoiceMessageViewHolder.java b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/media/holders/IncomingVoiceMessageViewHolder.java
index c87e395f..80c64b5b 100644
--- a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/media/holders/IncomingVoiceMessageViewHolder.java
+++ b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/media/holders/IncomingVoiceMessageViewHolder.java
@@ -18,8 +18,8 @@ public class IncomingVoiceMessageViewHolder
     private TextView tvDuration;
     private TextView tvTime;
 
-    public IncomingVoiceMessageViewHolder(View itemView) {
-        super(itemView);
+    public IncomingVoiceMessageViewHolder(View itemView, Object payload) {
+        super(itemView, payload);
         tvDuration = (TextView) itemView.findViewById(R.id.duration);
         tvTime = (TextView) itemView.findViewById(R.id.time);
     }
diff --git a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/media/holders/OutcomingVoiceMessageViewHolder.java b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/media/holders/OutcomingVoiceMessageViewHolder.java
index 556e1fcf..6d3dcbf8 100644
--- a/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/media/holders/OutcomingVoiceMessageViewHolder.java
+++ b/sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/custom/media/holders/OutcomingVoiceMessageViewHolder.java
@@ -18,8 +18,8 @@ public class OutcomingVoiceMessageViewHolder
     private TextView tvDuration;
     private TextView tvTime;
 
-    public OutcomingVoiceMessageViewHolder(View itemView) {
-        super(itemView);
+    public OutcomingVoiceMessageViewHolder(View itemView, Object payload) {
+        super(itemView, payload);
         tvDuration = (TextView) itemView.findViewById(R.id.duration);
         tvTime = (TextView) itemView.findViewById(R.id.time);
     }