diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
index cc878e4beb..2d6854f774 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
@@ -45,7 +45,7 @@ class LinkDeviceActivity : BaseActionBarActivity(), ScanQRCodeWrapperFragmentDel
     private var restoreJob: Job? = null
 
     override fun onBackPressed() {
-        if (restoreJob?.isActive == true) return // don't allow going back with pending job
+        if (restoreJob?.isActive == true) return // Don't allow going back with a pending job
         super.onBackPressed()
     }
 
@@ -53,14 +53,12 @@ class LinkDeviceActivity : BaseActionBarActivity(), ScanQRCodeWrapperFragmentDel
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setUpActionBarSessionLogo()
-        // Set the registration sync variables
         TextSecurePreferences.apply {
             setHasViewedSeed(this@LinkDeviceActivity, true)
             setConfigurationMessageSynced(this@LinkDeviceActivity, false)
             setRestorationTime(this@LinkDeviceActivity, System.currentTimeMillis())
             setLastProfileUpdateTime(this@LinkDeviceActivity, 0)
         }
-        // registration variables are synced
         setContentView(R.layout.activity_link_device)
         viewPager.adapter = adapter
         tabLayout.setupWithViewPager(viewPager)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt
index 0ee7e0f574..841b9e789a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt
@@ -30,14 +30,12 @@ class RecoveryPhraseRestoreActivity : BaseActionBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setUpActionBarSessionLogo()
-        // Set the registration sync variables
         TextSecurePreferences.apply {
             setHasViewedSeed(this@RecoveryPhraseRestoreActivity, true)
             setConfigurationMessageSynced(this@RecoveryPhraseRestoreActivity, false)
             setRestorationTime(this@RecoveryPhraseRestoreActivity, System.currentTimeMillis())
             setLastProfileUpdateTime(this@RecoveryPhraseRestoreActivity, System.currentTimeMillis())
         }
-        // registration variables are synced
         setContentView(R.layout.activity_recovery_phrase_restore)
         mnemonicEditText.imeOptions = mnemonicEditText.imeOptions or 16777216 // Always use incognito keyboard
         restoreButton.setOnClickListener { restore() }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt
index 229edab444..79f462b9f8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt
@@ -39,14 +39,12 @@ class RegisterActivity : BaseActionBarActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_register)
         setUpActionBarSessionLogo()
-        // Set the registration sync variables
         TextSecurePreferences.apply {
             setHasViewedSeed(this@RegisterActivity, false)
             setConfigurationMessageSynced(this@RegisterActivity, true)
             setRestorationTime(this@RegisterActivity, 0)
             setLastProfileUpdateTime(this@RegisterActivity, System.currentTimeMillis())
         }
-        // registration variables are synced
         registerButton.setOnClickListener { register() }
         copyButton.setOnClickListener { copyPublicKey() }
         val termsExplanation = SpannableStringBuilder("By using this service, you agree to our Terms of Service and Privacy Policy")
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 437246f230..49b5d36053 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -98,13 +98,6 @@
             android:layout_height="match_parent"
             android:background="@drawable/home_activity_gradient" />
 
-        <org.thoughtcrime.securesms.loki.views.NewConversationButtonSetView
-            android:id="@+id/newConversationButtonSet"
-            android:layout_width="276dp"
-            android:layout_height="236dp"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentBottom="true" />
-
         <LinearLayout
             android:id="@+id/emptyStateContainer"
             android:layout_width="wrap_content"
@@ -131,6 +124,13 @@
 
         </LinearLayout>
 
+        <org.thoughtcrime.securesms.loki.views.NewConversationButtonSetView
+            android:id="@+id/newConversationButtonSet"
+            android:layout_width="276dp"
+            android:layout_height="236dp"
+            android:layout_centerHorizontal="true"
+            android:layout_alignParentBottom="true" />
+
     </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt
index 3c1b6de032..2e884c79f0 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt
@@ -7,10 +7,8 @@ import nl.komponents.kovenant.functional.map
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.messaging.jobs.MessageReceiveJob
-import org.session.libsession.messaging.utilities.MessageWrapper
 import org.session.libsession.snode.SnodeAPI
 import org.session.libsignal.service.loki.utilities.getRandomElementOrNull
-import org.session.libsignal.utilities.Base64
 import org.session.libsignal.utilities.logging.Log
 import org.session.libsignal.utilities.successBackground
 
@@ -74,11 +72,8 @@ class ClosedGroupPoller {
                 if (messages.isNotEmpty()) {
                     Log.d("Loki", "Received ${messages.count()} new message(s) in closed group with public key: $publicKey.")
                 }
-                messages.forEach { message ->
-                    val rawMessageAsJSON = message as? Map<*, *>
-                    val base64EncodedData = rawMessageAsJSON?.get("data") as? String
-                    val data = base64EncodedData?.let { Base64.decode(it) } ?: return@forEach
-                    val job = MessageReceiveJob(MessageWrapper.unwrap(data).toByteArray(), false)
+                messages.forEach { envelope ->
+                    val job = MessageReceiveJob(envelope.toByteArray(), false)
                     JobQueue.shared.add(job)
                 }
             }
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
index e2754b4090..805bac8a8c 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
@@ -5,11 +5,9 @@ import nl.komponents.kovenant.functional.bind
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.messaging.jobs.MessageReceiveJob
-import org.session.libsession.messaging.utilities.MessageWrapper
 import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.snode.SnodeModule
 import org.session.libsignal.service.loki.Snode
-import org.session.libsignal.utilities.Base64
 import org.session.libsignal.utilities.logging.Log
 import java.security.SecureRandom
 import java.util.*