diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c
index b5f88958e..09b44a86d 100644
--- a/jni/dc_wrapper.c
+++ b/jni/dc_wrapper.c
@@ -499,9 +499,9 @@ JNIEXPORT jlong Java_com_b44t_messenger_DcContext_getMsgCPtr(JNIEnv *env, jobjec
 }
 
 
-JNIEXPORT jlong Java_com_b44t_messenger_DcContext_createMsgCPtr(JNIEnv *env, jobject obj)
+JNIEXPORT jlong Java_com_b44t_messenger_DcContext_createMsgCPtr(JNIEnv *env, jobject obj, jint viewtype)
 {
-	return (jlong)dc_msg_new(get_dc_context(env, obj));
+	return (jlong)dc_msg_new(get_dc_context(env, obj), viewtype);
 }
 
 
@@ -964,7 +964,7 @@ JNIEXPORT jlong Java_com_b44t_messenger_DcMsg_getTimestamp(JNIEnv *env, jobject
 
 JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getType(JNIEnv *env, jobject obj)
 {
-	return dc_msg_get_type(get_dc_msg(env, obj));
+	return dc_msg_get_viewtype(get_dc_msg(env, obj));
 }
 
 
@@ -1105,12 +1105,6 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcMsg_getSetupCodeBegin(JNIEnv *env, j
 }
 
 
-JNIEXPORT void Java_com_b44t_messenger_DcMsg_setType(JNIEnv *env, jobject obj, int type)
-{
-    dc_msg_set_type(get_dc_msg(env, obj), type);
-}
-
-
 JNIEXPORT void Java_com_b44t_messenger_DcMsg_setText(JNIEnv *env, jobject obj, jstring text)
 {
 	CHAR_REF(text);
diff --git a/src/com/b44t/messenger/DcContext.java b/src/com/b44t/messenger/DcContext.java
index 620707d89..fe1e8fdf9 100644
--- a/src/com/b44t/messenger/DcContext.java
+++ b/src/com/b44t/messenger/DcContext.java
@@ -166,7 +166,7 @@ public class DcContext {
     // working with raw c-data
     private long        contextCPtr;     // CAVE: the name is referenced in the JNI
     private native long createContextCPtr(String osName);
-    public  native long createMsgCPtr    ();
+    public  native long createMsgCPtr    (int viewtype);
     private native long getChatlistCPtr  (int listflags, String query, int queryId);
     private native long getChatCPtr      (int chat_id);
     private native long getMsgCPtr       (int id);
diff --git a/src/com/b44t/messenger/DcMsg.java b/src/com/b44t/messenger/DcMsg.java
index f66c27c4e..c64260389 100644
--- a/src/com/b44t/messenger/DcMsg.java
+++ b/src/com/b44t/messenger/DcMsg.java
@@ -57,8 +57,8 @@ public class DcMsg {
     public final static int DC_MSG_ID_MARKER1 = 1;
     public final static int DC_MSG_ID_DAYMARKER = 9;
 
-    public DcMsg(DcContext context) {
-        msgCPtr = context.createMsgCPtr();
+    public DcMsg(DcContext context, int viewtype) {
+        msgCPtr = context.createMsgCPtr(viewtype);
     }
 
     public DcMsg(long msgCPtr) {
@@ -107,7 +107,6 @@ public class DcMsg {
     public native boolean isSetupMessage     ();
     public native String  getSetupCodeBegin  ();
     public native boolean isIncreation       ();
-    public native void    setType            (int type);
     public native void    setText            (String text);
     public native void    setFile            (String file, String filemime);
     public native void    setDimension       (int width, int height);
diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
index 5a60eb162..cdef8fe99 100644
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -345,7 +345,7 @@ public class ConversationFragment extends Fragment
 
     StringBuilder result = new StringBuilder();
 
-    DcMsg prevMsg = new DcMsg(dcContext);
+    DcMsg prevMsg = new DcMsg(dcContext, DcMsg.DC_MSG_TEXT);
     for (DcMsg msg : dcMsgsList) {
       if (result.length()>0) {
         result.append("\n\n");