Thread base folder

app/src/main/java/eu/faircode/email/ActivityView.java

@@ -1266,6 +1266,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
         Bundle args = new Bundle();
         args.putLong("account", intent.getLongExtra("account", -1));
+        args.putLong("folder", intent.getLongExtra("folder", -1));
         args.putString("thread", intent.getStringExtra("thread"));
         args.putLong("id", intent.getLongExtra("id", -1));
         args.putBoolean("filter_archive", intent.getBooleanExtra("filter_archive", true));

app/src/main/java/eu/faircode/email/AdapterMessage.java

@@ -2780,6 +2780,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     final LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
                     final Intent viewThread = new Intent(ActivityView.ACTION_VIEW_THREAD)
                             .putExtra("account", message.account)
+                            .putExtra("folder", message.folder)
                             .putExtra("thread", message.thread)
                             .putExtra("id", message.id)
                             .putExtra("filter_archive", !EntityFolder.ARCHIVE.equals(message.folderType))
@@ -3998,6 +3999,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             Bundle args = new Bundle();
             args.putString("title", context.getString(R.string.title_snooze));
             args.putLong("account", message.account);
+            args.putLong("folder", message.folder);
             args.putString("thread", message.thread);
             args.putLong("id", message.id);
             args.putBoolean("finish", true);

app/src/main/java/eu/faircode/email/AdapterOperation.java

@@ -171,6 +171,7 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
                         lbm.sendBroadcast(
                                 new Intent(ActivityView.ACTION_VIEW_THREAD)
                                         .putExtra("account", message.account)
+                                        .putExtra("folder", message.folder)
                                         .putExtra("thread", message.thread)
                                         .putExtra("id", message.id)
                                         .putExtra("found", false));

app/src/main/java/eu/faircode/email/Core.java

@@ -3239,6 +3239,7 @@ class Core {
                 thread.setAction("thread:" + message.thread);
                 thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 thread.putExtra("account", message.account);
+                thread.putExtra("folder", message.folder);
                 thread.putExtra("id", message.id);
                 thread.putExtra("filter_archive", !EntityFolder.ARCHIVE.equals(message.folderType));
                 piContent = PendingIntent.getActivity(context, ActivityView.REQUEST_THREAD, thread, PendingIntent.FLAG_UPDATE_CURRENT);

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -4490,6 +4490,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                 Bundle nargs = new Bundle();
                 nargs.putLong("account", message.account);
+                nargs.putLong("folder", message.folder);
                 nargs.putString("thread", message.thread);
                 nargs.putLong("id", message.id);
                 nargs.putBoolean("found", found);

app/src/main/java/eu/faircode/email/ServiceUI.java

@@ -434,6 +434,7 @@ public class ServiceUI extends IntentService {
             thread.setAction("thread:" + message.thread);
             thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             thread.putExtra("account", message.account);
+            thread.putExtra("folder", message.folder);
             thread.putExtra("id", message.id);
             thread.putExtra("filter_archive", !EntityFolder.ARCHIVE.equals(folder.type));
             startActivity(thread);

app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java

@@ -155,6 +155,7 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot
 
             Intent thread = new Intent(context, ActivityView.class);
             thread.putExtra("account", message.account);
+            thread.putExtra("folder", message.folder);
             thread.putExtra("thread", message.thread);
             thread.putExtra("id", message.id);
             views.setOnClickFillInIntent(R.id.llMessage, thread);