diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 34321f8552..988705979d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -232,6 +232,11 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.thoughtcrime.securesms.loki.activities.HomeActivity" />
         </activity>
+        <activity
+            android:name="org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.TextSecure.DayNight.NoActionBar">
+        </activity>
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.OpenGroupGuidelinesActivity"
             android:screenOrientation="portrait"
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 0ae4adf548..2b70bb5d39 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.conversation.v2
 
 import android.os.Bundle
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.android.synthetic.main.activity_home.*
+import kotlinx.android.synthetic.main.activity_conversation_v2.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.database.DatabaseFactory
@@ -28,8 +28,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity() {
         val cursor = DatabaseFactory.getMmsSmsDatabase(this).getConversation(threadID)
         val adapter = ConversationAdapter(this, cursor)
         adapter.setHasStableIds(true)
-        recyclerView.adapter = adapter
-        recyclerView.layoutManager = LinearLayoutManager(this)
+        conversationRecyclerView.adapter = adapter
+        conversationRecyclerView.layoutManager = LinearLayoutManager(this)
     }
     // endregion
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/MessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/MessageView.kt
index 6f239ed9a3..1c7b9941da 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/MessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/MessageView.kt
@@ -2,7 +2,10 @@ package org.thoughtcrime.securesms.conversation.v2.messages
 
 import android.content.Context
 import android.util.AttributeSet
+import android.view.LayoutInflater
 import android.widget.LinearLayout
+import kotlinx.android.synthetic.main.view_message.view.*
+import network.loki.messenger.R
 import org.thoughtcrime.securesms.database.model.MessageRecord
 
 class MessageView : LinearLayout {
@@ -21,13 +24,13 @@ class MessageView : LinearLayout {
     }
 
     private fun setUpViewHierarchy() {
-        // TODO: Implement
+        LayoutInflater.from(context).inflate(R.layout.view_message, this)
     }
     // endregion
 
     // region Updating
     fun bind(message: MessageRecord) {
-
+        testTextView.text = message.body
     }
 
     fun recycle() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
index 9948aec40e..334ca80660 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -38,6 +38,7 @@ import org.session.libsignal.utilities.ThreadUtils
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.conversation.ConversationActivity
+import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.loki.api.OpenGroupManager
@@ -345,13 +346,8 @@ class HomeActivity : PassphraseRequiredActionBarActivity(), ConversationClickLis
     }
 
     private fun openConversation(thread: ThreadRecord) {
-        val intent = Intent(this, ConversationActivity::class.java)
-        intent.putExtra(ConversationActivity.ADDRESS_EXTRA, thread.recipient.address)
-        intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, thread.threadId)
-        intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, thread.distributionType)
-        intent.putExtra(ConversationActivity.TIMING_EXTRA, System.currentTimeMillis())
-        intent.putExtra(ConversationActivity.LAST_SEEN_EXTRA, thread.lastSeen)
-        intent.putExtra(ConversationActivity.STARTING_POSITION_EXTRA, -1)
+        val intent = Intent(this, ConversationActivityV2::class.java)
+        intent.putExtra(ConversationActivityV2.THREAD_ID, thread.threadId)
         push(intent)
     }
 
diff --git a/app/src/main/res/layout/view_message.xml b/app/src/main/res/layout/view_message.xml
new file mode 100644
index 0000000000..f9c3545d87
--- /dev/null
+++ b/app/src/main/res/layout/view_message.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/testTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text" />
+
+</LinearLayout>
\ No newline at end of file