diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
index 697f6718c2..6dcc928c99 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
@@ -1,5 +1,7 @@
 package org.thoughtcrime.securesms.linkpreview;
 
+import static org.session.libsession.utilities.Util.readFully;
+
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -8,8 +10,6 @@ import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.google.android.gms.common.util.IOUtils;
-
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress;
 import org.session.libsession.messaging.sending_receiving.attachments.UriAttachment;
@@ -148,7 +148,7 @@ public class LinkPreviewRepository {
         InputStream bodyStream = response.body().byteStream();
         controller.setStream(bodyStream);
 
-        byte[]               data      = IOUtils.readInputStreamFully(bodyStream);
+        byte[]               data      = readFully(bodyStream);
         Bitmap               bitmap    = BitmapFactory.decodeByteArray(data, 0, data.length);
         Optional<Attachment> thumbnail = bitmapToAttachment(bitmap, Bitmap.CompressFormat.JPEG, MediaTypes.IMAGE_JPEG);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushNotificationService.kt b/app/src/play/kotlin/org/thoughtcrime/securesms/notifications/PushNotificationService.kt
similarity index 88%
rename from app/src/main/java/org/thoughtcrime/securesms/notifications/PushNotificationService.kt
rename to app/src/play/kotlin/org/thoughtcrime/securesms/notifications/PushNotificationService.kt
index 6e4f8d104a..6bf18131e9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushNotificationService.kt
+++ b/app/src/play/kotlin/org/thoughtcrime/securesms/notifications/PushNotificationService.kt
@@ -28,6 +28,13 @@ class PushNotificationService : FirebaseMessagingService() {
 
     override fun onMessageReceived(message: RemoteMessage) {
         Log.d("Loki", "Received a push notification.")
+        if (message.data.containsKey("spns")) {
+            // assume this is the new push notification content
+            // deal with the enc payload (probably decrypting through the PushManager?
+            Log.d("Loki", "TODO: deal with the enc_payload\n${message.data["enc_payload"]}")
+            pushManager.decrypt(message.data)
+            return
+        }
         val base64EncodedData = message.data?.get("ENCRYPTED_DATA")
         val data = base64EncodedData?.let { Base64.decode(it) }
         if (data != null) {
diff --git a/app/src/website/kotlin/org/thoughtcrime/securesms/notifications/NoOpPushManager.kt b/app/src/website/kotlin/org/thoughtcrime/securesms/notifications/NoOpPushManager.kt
new file mode 100644
index 0000000000..edbf7d710d
--- /dev/null
+++ b/app/src/website/kotlin/org/thoughtcrime/securesms/notifications/NoOpPushManager.kt
@@ -0,0 +1,14 @@
+package org.thoughtcrime.securesms.notifications
+
+import org.session.libsignal.utilities.Log
+
+class NoOpPushManager: PushManager {
+
+    override fun register(force: Boolean) {
+        Log.d("NoOpPushManager", "Push notifications not supported, not registering for push notifications")
+    }
+
+    override fun unregister(token: String) {
+        Log.d("NoOpPushManager", "Push notifications not supported, not unregistering for push notifications")
+    }
+}
\ No newline at end of file
diff --git a/app/src/website/kotlin/org/thoughtcrime/securesms/notifications/NoOpPushModule.kt b/app/src/website/kotlin/org/thoughtcrime/securesms/notifications/NoOpPushModule.kt
new file mode 100644
index 0000000000..1c8f2f936c
--- /dev/null
+++ b/app/src/website/kotlin/org/thoughtcrime/securesms/notifications/NoOpPushModule.kt
@@ -0,0 +1,15 @@
+package org.thoughtcrime.securesms.notifications
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class NoOpPushModule {
+    @Provides
+    @Singleton
+    fun provideNoOpManager(): PushManager = NoOpPushManager()
+}
\ No newline at end of file