diff --git a/src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java b/src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
index 3f7e2b81c..108ca2ac2 100644
--- a/src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
+++ b/src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
@@ -11,6 +11,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.widget.Toast;
 
 import org.thoughtcrime.securesms.database.Address;
+import org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 
@@ -37,7 +38,7 @@ public class ShortcutLauncherActivity extends AppCompatActivity {
 
     if (serializedAddress == null) {
       Toast.makeText(this, R.string.ShortcutLauncherActivity_invalid_shortcut, Toast.LENGTH_SHORT).show();
-      startActivity(new Intent(this, ConversationListActivity.class));
+      startActivity(new Intent(this, HomeActivity.class));
       finish();
       return;
     }
@@ -45,7 +46,7 @@ public class ShortcutLauncherActivity extends AppCompatActivity {
     Address          address   = Address.fromSerialized(serializedAddress);
     Recipient        recipient = Recipient.from(this, address, true);
     TaskStackBuilder backStack = TaskStackBuilder.create(this)
-                                                 .addNextIntent(new Intent(this, ConversationListActivity.class));
+                                                 .addNextIntent(new Intent(this, HomeActivity.class));
 
     CommunicationActions.startConversation(this, recipient, null, backStack);
     finish();
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index cf02b3c02..4081e4b5c 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -3127,11 +3127,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         case "messageSent": actionBarSubtitleTextView.setText("Message sent securely"); break;
         case "messageFailed": actionBarSubtitleTextView.setText("Message failed to send"); break;
       }
-    } else if (recipient.isGroupRecipient()) {
-      actionBarSubtitleTextView.setText("26 members");
     } else if (recipient.isMuted()) {
       muteIndicatorImageView.setVisibility(View.VISIBLE);
       actionBarSubtitleTextView.setText("Muted until " + DateUtils.getFormattedDateTime(recipient.mutedUntil, "EEE, MMM d, yyyy HH:mm", Locale.getDefault()));
+    } else if (recipient.isGroupRecipient()) {
+      actionBarSubtitleTextView.setText("26 members");
     } else {
       actionBarSubtitleTextView.setVisibility(View.GONE);
     }