diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
index bb24b04dac..514363f404 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
@@ -72,6 +72,8 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
                 deleteThreadAtCurrentPosition()
             }
         }
+        // Double check that the long poller is up
+        (applicationContext as ApplicationContext).startLongPollingIfNeeded()
         // Set content view
         setContentView(R.layout.activity_home)
         // Set custom toolbar
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/views/FriendRequestView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/FriendRequestView.kt
index 589b6d2866..8f4fe1a410 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/views/FriendRequestView.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/FriendRequestView.kt
@@ -13,6 +13,7 @@ import android.widget.TextView
 import com.github.ybq.android.spinkit.style.DoubleBounce
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.loki.getColorWithID
 import org.thoughtcrime.securesms.loki.toPx
@@ -120,6 +121,10 @@ class FriendRequestView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         val contactID = DatabaseFactory.getThreadDatabase(context).getRecipientForThreadId(message!!.threadId)!!.address.toString()
         val contactDisplayName = DatabaseFactory.getLokiUserDatabase(context).getDisplayName(contactID) ?: contactID
         val friendRequestStatus = lokiMessageDatabase.getFriendRequestStatus(message.id)
+        if (message is MediaMmsMessageRecord) {
+            visibility = View.GONE
+            return
+        }
         if (!message.isOutgoing) {
             visibility = if (friendRequestStatus == LokiMessageFriendRequestStatus.NONE) View.GONE else View.VISIBLE
             buttonLinearLayout.visibility = if (friendRequestStatus != LokiMessageFriendRequestStatus.REQUEST_PENDING) View.GONE else View.VISIBLE