diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fc6475ed64..819179fb66 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -494,7 +494,7 @@
             android:label="@string/AndroidManifest_remove_photo"
             android:theme="@style/Theme.AppCompat.Dialog.Alert">
             <intent-filter>
-                <action android:name="org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO" />
+                <action android:name="network.loki.securesms.action.CLEAR_PROFILE_PHOTO" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -542,7 +542,7 @@
             android:enabled="true"
             android:exported="false">
             <intent-filter>
-                <action android:name="org.thoughtcrime.securesms.notifications.CLEAR" />
+                <action android:name="network.loki.securesms.notifications.CLEAR" />
             </intent-filter>
         </receiver>
         <receiver
@@ -550,21 +550,21 @@
             android:enabled="true"
             android:exported="false">
             <intent-filter>
-                <action android:name="org.thoughtcrime.securesms.notifications.WEAR_REPLY" />
+                <action android:name="network.loki.securesms.notifications.WEAR_REPLY" />
             </intent-filter>
         </receiver>
         <receiver
             android:name="org.thoughtcrime.securesms.notifications.AndroidAutoHeardReceiver"
             android:exported="false">
             <intent-filter>
-                <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_HEARD" />
+                <action android:name="network.loki.securesms.notifications.ANDROID_AUTO_HEARD" />
             </intent-filter>
         </receiver>
         <receiver
             android:name="org.thoughtcrime.securesms.notifications.AndroidAutoReplyReceiver"
             android:exported="false">
             <intent-filter>
-                <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_REPLY" />
+                <action android:name="network.loki.securesms.notifications.ANDROID_AUTO_REPLY" />
             </intent-filter>
         </receiver>
         <receiver android:name="org.thoughtcrime.securesms.service.ExpirationListener" />
@@ -612,7 +612,7 @@
         <receiver android:name="org.thoughtcrime.securesms.service.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="org.thoughtcrime.securesms.RESTART" />
+                <action android:name="network.loki.securesms.RESTART" />
             </intent-filter>
         </receiver>
         <receiver android:name="org.thoughtcrime.securesms.service.DirectoryRefreshListener">
@@ -647,12 +647,12 @@
         </receiver>
         <receiver android:name="org.thoughtcrime.securesms.notifications.MessageNotifier$ReminderReceiver">
             <intent-filter>
-                <action android:name="org.thoughtcrime.securesms.MessageNotifier.REMINDER_ACTION" />
+                <action android:name="network.loki.securesms.MessageNotifier.REMINDER_ACTION" />
             </intent-filter>
         </receiver>
         <receiver android:name="org.thoughtcrime.securesms.notifications.DeleteNotificationReceiver">
             <intent-filter>
-                <action android:name="org.thoughtcrime.securesms.DELETE_NOTIFICATION" />
+                <action android:name="network.loki.securesms.DELETE_NOTIFICATION" />
             </intent-filter>
         </receiver>
         <receiver android:name="org.thoughtcrime.securesms.ExperienceUpgradeActivity$AppUpgradeReceiver">
@@ -662,7 +662,7 @@
                 <data android:scheme="package" />
             </intent-filter>
             <intent-filter>
-                <action android:name="org.thoughtcrime.securesms.ExperienceUpgradeActivity.DISMISS_ACTION" />
+                <action android:name="network.loki.securesms.ExperienceUpgradeActivity.DISMISS_ACTION" />
             </intent-filter>
         </receiver>
         <receiver
diff --git a/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java b/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
index 47f9b6b44f..d0de27204c 100644
--- a/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
+++ b/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
@@ -33,7 +33,7 @@ import network.loki.messenger.R;
 
 public class ExperienceUpgradeActivity extends BaseActionBarActivity implements TypingIndicatorIntroFragment.Controller, LinkPreviewsIntroFragment.Controller {
   private static final String TAG             = ExperienceUpgradeActivity.class.getSimpleName();
-  private static final String DISMISS_ACTION  = "org.thoughtcrime.securesms.ExperienceUpgradeActivity.DISMISS_ACTION";
+  private static final String DISMISS_ACTION  = "network.loki.securesms.ExperienceUpgradeActivity.DISMISS_ACTION";
   private static final int    NOTIFICATION_ID = 1339;
 
   private enum ExperienceUpgrade {
diff --git a/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java b/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java
index 6886b27c8d..328cd20c8b 100644
--- a/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java
+++ b/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java
@@ -102,7 +102,7 @@ public final class AvatarSelection {
     }
 
     if (includeClear) {
-      extraIntents.add(new Intent("org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO"));
+      extraIntents.add(new Intent("network.loki.securesms.action.CLEAR_PROFILE_PHOTO"));
     }
 
     Intent chooserIntent = Intent.createChooser(galleryIntent, context.getString(R.string.CreateProfileActivity_profile_photo));
diff --git a/src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java b/src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java
index ba1032f634..dfa974a1f8 100644
--- a/src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java
+++ b/src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java
@@ -37,7 +37,7 @@ import java.util.List;
 public class AndroidAutoHeardReceiver extends BroadcastReceiver {
 
   public static final String TAG                   = AndroidAutoHeardReceiver.class.getSimpleName();
-  public static final String HEARD_ACTION          = "org.thoughtcrime.securesms.notifications.ANDROID_AUTO_HEARD";
+  public static final String HEARD_ACTION          = "network.loki.securesms.notifications.ANDROID_AUTO_HEARD";
   public static final String THREAD_IDS_EXTRA      = "car_heard_thread_ids";
   public static final String NOTIFICATION_ID_EXTRA = "car_notification_id";
 
diff --git a/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java b/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java
index c6c91ab02f..d196fe432e 100644
--- a/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java
+++ b/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java
@@ -44,7 +44,7 @@ import java.util.List;
 public class AndroidAutoReplyReceiver extends BroadcastReceiver {
 
   public static final String TAG             = AndroidAutoReplyReceiver.class.getSimpleName();
-  public static final String REPLY_ACTION    = "org.thoughtcrime.securesms.notifications.ANDROID_AUTO_REPLY";
+  public static final String REPLY_ACTION    = "network.loki.securesms.notifications.ANDROID_AUTO_REPLY";
   public static final String ADDRESS_EXTRA   = "car_address";
   public static final String VOICE_REPLY_KEY = "car_voice_reply_key";
   public static final String THREAD_ID_EXTRA = "car_reply_thread_id";
diff --git a/src/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java b/src/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java
index be541f2add..ea065fd18a 100644
--- a/src/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java
+++ b/src/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java
@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
 
 public class DeleteNotificationReceiver extends BroadcastReceiver {
 
-  public static String DELETE_NOTIFICATION_ACTION = "org.thoughtcrime.securesms.DELETE_NOTIFICATION";
+  public static String DELETE_NOTIFICATION_ACTION = "network.loki.securesms.DELETE_NOTIFICATION";
 
   public static String EXTRA_IDS = "message_ids";
   public static String EXTRA_MMS = "is_mms";
diff --git a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
index ed82b436a0..c6e7f1b784 100644
--- a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
+++ b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
@@ -35,7 +35,7 @@ import kotlin.contracts.Returns;
 public class MarkReadReceiver extends BroadcastReceiver {
 
   private static final String TAG                   = MarkReadReceiver.class.getSimpleName();
-  public static final  String CLEAR_ACTION          = "org.thoughtcrime.securesms.notifications.CLEAR";
+  public static final  String CLEAR_ACTION          = "network.loki.securesms.notifications.CLEAR";
   public static final  String THREAD_IDS_EXTRA      = "thread_ids";
   public static final  String NOTIFICATION_ID_EXTRA = "notification_id";
 
diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
index 3a3ca331f9..7941014245 100644
--- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
@@ -514,7 +514,7 @@ public class MessageNotifier {
 
   public static class ReminderReceiver extends BroadcastReceiver {
 
-    public static final String REMINDER_ACTION = "org.thoughtcrime.securesms.MessageNotifier.REMINDER_ACTION";
+    public static final String REMINDER_ACTION = "network.loki.securesms.MessageNotifier.REMINDER_ACTION";
 
     @SuppressLint("StaticFieldLeak")
     @Override
diff --git a/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
index 1f36a125f9..7b42d10aca 100644
--- a/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
+++ b/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
@@ -44,7 +44,7 @@ import java.util.List;
 public class RemoteReplyReceiver extends BroadcastReceiver {
 
   public static final String TAG           = RemoteReplyReceiver.class.getSimpleName();
-  public static final String REPLY_ACTION  = "org.thoughtcrime.securesms.notifications.WEAR_REPLY";
+  public static final String REPLY_ACTION  = "network.loki.securesms.notifications.WEAR_REPLY";
   public static final String ADDRESS_EXTRA = "address";
   public static final String REPLY_METHOD  = "reply_method";
 
@@ -85,11 +85,6 @@ public class RemoteReplyReceiver extends BroadcastReceiver {
               threadId = MessageSender.send(context, reply, -1, false, null);
               break;
             }
-            case UnsecuredSmsMessage: {
-              OutgoingTextMessage reply = new OutgoingTextMessage(recipient, responseText.toString(), expiresIn, subscriptionId);
-              threadId = MessageSender.send(context, reply, -1, true, null);
-              break;
-            }
             default:
               throw new AssertionError("Unknown Reply method");
           }
diff --git a/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java b/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java
index fe660f1ec8..e744b5f58b 100644
--- a/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java
+++ b/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java
@@ -10,16 +10,12 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 public enum ReplyMethod {
 
   GroupMessage,
-  SecureMessage,
-  UnsecuredSmsMessage;
+  SecureMessage;
 
   public static @NonNull ReplyMethod forRecipient(Context context, Recipient recipient) {
     if (recipient.isGroupRecipient()) {
       return ReplyMethod.GroupMessage;
-    } else if (TextSecurePreferences.isPushRegistered(context) && recipient.getRegistered() == RecipientDatabase.RegisteredState.REGISTERED && !recipient.isForceSmsSelection()) {
-      return ReplyMethod.SecureMessage;
-    } else {
-      return ReplyMethod.UnsecuredSmsMessage;
     }
+    return ReplyMethod.SecureMessage;
   }
 }