bump version

Merge remote-tracking branch 'upstream/l10n_master'
Translated using Weblate (German)
2023-06-04 23:16:32 +02:00 · 2023-06-04 23:14:49 +02:00 · 2023-06-04 21:13:53 +00:00 · 2023-06-04 23:03:29 +02:00 · 2023-06-04 22:58:56 +02:00 · 2023-06-04 22:57:06 +02:00
317 changed files with 10517 additions and 3236 deletions
--- a/.github/workflows/validate-gradle-wrapper.yml
+++ b/.github/workflows/validate-gradle-wrapper.yml
@@ -0,0 +1,11 @@
 name: Validate Gradle Wrapper
 on: [pull_request, push]
 jobs:
  validation:
    name: Validation
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
      - uses: gradle/wrapper-validation-action@v1
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ On the Fediverse, it’s quite common for people to pin posts they want others t
 [apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk](https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk)
-<a href="#installation"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-badge.png"></a>
+<a href="https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-badge.png"></a>
 Note that you'll need to add Izzy's F-Droid repository to your F-Droid app first:
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -6,7 +6,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Megalodon</title>
    <link rel="icon" href="mastodon/src/main/res/mipmap-mdpi/ic_launcher_round.png">
-    <link rel="me" href="https://floss.social/@mastodon">
+    <link rel="me" href="https://floss.social/@megalodon">
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/5.1.0/github-markdown.min.css">
  </head>
  <body class="markdown-body">
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.3.1'
+		classpath 'com.android.tools.build:gradle:8.0.0'
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files
 	}
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,5 +0,0 @@
 files:
  - source: /mastodon/src/main/res/values/strings.xml
    translation: /mastodon/src/main/res/values-%android_code%/strings.xml
  - source: /fastlane/metadata/android/en-US/*.txt
    translation: /fastlane/metadata/android/%locale%/%original_file_name%
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,4 +16,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=false
+android.enableJetifier=false
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=false
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 #Thu Jan 13 11:33:43 MSK 2022
 distributionBase=GRADLE_USER_HOME
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/288
+++ b/288
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,98 @@
 #
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
 #   Important for running:
 #
 #   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
 #       noncompliant, but you have some other compliant shell such as ksh or
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
 #           ksh Gradle
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
 #         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
 #           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
 #         * compound commands having a testable exit status, especially «case»;
 #         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
 #   (2) This script targets any POSIX shell, so it avoids extensions provided
 #       by Bash, Ksh, etc; in particular arrays are avoided.
 #
 #       The "traditional" practice of packing multiple parameters into a
 #       space-separated string is a well documented source of bugs and security
 #       problems, so this is (mostly) avoided, by progressively accumulating
 #       options in "$@", and eventually passing that to Java.
 #
 #       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
 #       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
 #       see the in-line comments for details.
 #
 #       There are tweaks for specific operating systems such as AIX, CygWin,
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
 #       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
 #
 ##############################################################################
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
      /*)   app_path=$link ;; #(
      *)    app_path=$APP_HOME$link ;;
    esac
 done
 SAVED="`pwd`"
 cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
 cd "$SAVED" >/dev/null
-APP_NAME="Gradle"
+# This is normally unused
-APP_BASE_NAME=`basename "$0"`
+# shellcheck disable=SC2034
-
+APP_BASE_NAME=${0##*/}
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 warn () {
    echo "$*"
-}
+} >&2
 die () {
    echo
    echo "$*"
    echo
    exit 1
-}
+} >&2
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
    darwin=true
    ;;
  MINGW* )
    msys=true
    ;;
  NONSTOP* )
    nonstop=true
    ;;
 esac
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
    else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD="java"
+    JAVACMD=java
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +137,109 @@ location of your Java installation."
 fi
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-            MAX_FD="$MAX_FD_LIMIT"
+        # shellcheck disable=SC3045
-        fi
+        MAX_FD=$( ulimit -H -n ) ||
-        ulimit -n $MAX_FD
+            warn "Could not query maximum file descriptor limit"
-        if [ $? -ne 0 ] ; then
+    esac
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+    case $MAX_FD in  #(
-        fi
+      '' | soft) :;; #(
-    else
+      *)
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-    fi
+        # shellcheck disable=SC3045
-fi
+        ulimit -n "$MAX_FD" ||
-
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
 # For Darwin, add options to specify how the application appears in the dock
 if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
    JAVACMD=`cygpath --unix "$JAVACMD"`
    # We build the pattern for arguments to be converted via cygpath
    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
    SEP=""
    for dir in $ROOTDIRSRAW ; do
        ROOTDIRS="$ROOTDIRS$SEP$dir"
        SEP="|"
    done
    OURCYGPATTERN="(^($ROOTDIRS))"
    # Add a user-defined pattern to the cygpath arguments
    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
    fi
    # Now convert the arguments - kludge to limit ourselves to /bin/sh
    i=0
    for arg in "$@" ; do
        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
        else
            eval `echo args$i`="\"$arg\""
        fi
        i=`expr $i + 1`
    done
    case $i in
        0) set -- ;;
        1) set -- "$args0" ;;
        2) set -- "$args0" "$args1" ;;
        3) set -- "$args0" "$args1" "$args2" ;;
        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --module-path (only if needed)
 #   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
    JAVACMD=$( cygpath --unix "$JAVACMD" )
    # Now convert the arguments - kludge to limit ourselves to /bin/sh
    for arg do
        if
            case $arg in                                #(
              -*)   false ;;                            # don't mess with options #(
              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
                    [ -e "$t" ] ;;                      #(
              *)    false ;;
            esac
        then
            arg=$( cygpath --path --ignore --mixed "$arg" )
        fi
        # Roll the args list around exactly as many times as the number of
        # args, so each arg winds up back in the position where it started, but
        # possibly modified.
        #
        # NB: a `for` loop captures its iteration list before it begins, so
        # changing the positional parameters here affects neither the number of
        # iterations, nor the values presented in `arg`.
        shift                   # remove old arg
        set -- "$@" "$arg"      # push replacement arg
    done
 fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
 #     double quotes to make sure that they get re-expanded; and
 #   * put everything else in single quotes, so that it's not re-expanded.
 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
        -classpath "$CLASSPATH" \
        org.gradle.wrapper.GradleWrapperMain \
        "$@"
 # Stop when "xargs" is not available.
 if ! command -v xargs >/dev/null 2>&1
 then
    die "xargs is not available"
 fi
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
 #
 # In Bash we could simply go:
 #
 #   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
 #   set -- "${ARGS[@]}" "$@"
 #
 # but POSIX shell has neither arrays nor command substitution, so instead we
 # post-process each arg (as a line of input to sed) to backslash-escape any
 # character that might be a shell metacharacter, then use eval to reverse
 # that process (while maintaining the separation between arguments), and wrap
 # the whole thing up as a single "set" statement.
 #
 # This will of course break if any of these variables contains a newline or
 # an unmatched quote.
 #
 eval "set -- $(
        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
        xargs -n1 |
        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
        tr '\n' ' '
    )" '"$@"'
 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 :end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
 if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
 exit /b %EXIT_CODE%
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -2,6 +2,12 @@ plugins {
 	id 'com.android.application'
 }
 java {
 	toolchain {
 		languageVersion = JavaLanguageVersion.of(17)
 	}
 }
 android {
 	compileSdk 33
 	defaultConfig {
@@ -9,11 +15,11 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 77
+		versionCode 90
-		versionName "1.2.0+fork.77"
+		versionName "1.2.3+fork.90"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "da-rDK", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fa-rIR", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "ig-rNG", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "my-rMM", "nl-rNL", "no-rNO", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
+        resourceConfigurations += ['ar-rSA', 'ar-rDZ', 'be-rBY', 'bn-rBD', 'bs-rBA', 'ca-rES', 'cs-rCZ', 'da-rDK', 'de-rDE', 'el-rGR', 'es-rES', 'eu-rES', 'fa-rIR', 'fi-rFI', 'fil-rPH', 'fr-rFR', 'ga-rIE', 'gd-rGB', 'gl-rES', 'hi-rIN', 'hr-rHR', 'hu-rHU', 'hy-rAM', 'ig-rNG', 'in-rID', 'is-rIS', 'it-rIT', 'iw-rIL', 'ja-rJP', 'kab', 'ko-rKR', 'my-rMM', 'nl-rNL', 'no-rNO', 'oc-rFR', 'pl-rPL', 'pt-rBR', 'pt-rPT', 'ro-rRO', 'ru-rRU', 'si-rLK', 'sl-rSI', 'sv-rSE', 'th-rTH', 'tr-rTR', 'uk-rUA', 'ur-rIN', 'vi-rVN', 'zh-rCN', 'zh-rTW']
-	}
+    }
 	buildTypes {
 		release {
@@ -49,14 +55,19 @@ android {
 			setRoot "src/github"
 		}
 	}
-	lintOptions{
+	namespace 'org.joinmastodon.android'
-		checkReleaseBuilds false
+	lint {
 		abortOnError false
 		checkReleaseBuilds false
 	}
 	buildFeatures {
 		buildConfig true
 	}
 }
 dependencies {
-	api 'androidx.annotation:annotation:1.3.0'
+	api 'androidx.annotation:annotation:1.6.0'
 	implementation 'com.squareup.okhttp3:okhttp:3.14.9'
 	implementation 'me.grishka.litex:recyclerview:1.2.1.1'
 	implementation 'me.grishka.litex:swiperefreshlayout:1.1.0.1'
@@ -65,7 +76,7 @@ dependencies {
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
 	implementation 'me.grishka.appkit:appkit:1.2.7'
-	implementation 'com.google.code.gson:gson:2.8.9'
+	implementation 'com.google.code.gson:gson:2.9.0'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'
 	implementation 'de.psdev:async-otto:1.0.3'
--- a/mastodon/src/androidTest/java/org/joinmastodon/android/fragments/ThreadFragmentTest.java
+++ b/mastodon/src/androidTest/java/org/joinmastodon/android/fragments/ThreadFragmentTest.java
@@ -0,0 +1,107 @@
 package org.joinmastodon.android.fragments;
 import static org.junit.Assert.*;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusContext;
 import org.junit.Test;
 import java.time.Instant;
 import java.util.List;
 public class ThreadFragmentTest {
 	private Status fakeStatus(String id, String inReplyTo) {
 		Status status = Status.ofFake(id, null, null);
 		status.inReplyToId = inReplyTo;
 		return status;
 	}
 	private ThreadFragment.NeighborAncestryInfo fakeInfo(Status s, Status d, Status a) {
 		return new ThreadFragment.NeighborAncestryInfo(s, d, a);
 	}
 	@Test
 	public void mapNeighborhoodAncestry() {
 		StatusContext context = new StatusContext();
 		context.ancestors = List.of(
 				fakeStatus("oldest ancestor", null),
 				fakeStatus("younger ancestor", "oldest ancestor")
 		);
 		Status mainStatus = fakeStatus("main status", "younger ancestor");
 		context.descendants = List.of(
 				fakeStatus("first reply", "main status"),
 				fakeStatus("reply to first reply", "first reply"),
 				fakeStatus("third level reply", "reply to first reply"),
 				fakeStatus("another reply", "main status")
 		);
 		List<ThreadFragment.NeighborAncestryInfo> neighbors =
 				ThreadFragment.mapNeighborhoodAncestry(mainStatus, context);
 		assertEquals(List.of(
 				fakeInfo(context.ancestors.get(0), context.ancestors.get(1), null),
 				fakeInfo(context.ancestors.get(1), mainStatus, context.ancestors.get(0)),
 				fakeInfo(mainStatus, context.descendants.get(0), context.ancestors.get(1)),
 				fakeInfo(context.descendants.get(0), context.descendants.get(1), mainStatus),
 				fakeInfo(context.descendants.get(1), context.descendants.get(2), context.descendants.get(0)),
 				fakeInfo(context.descendants.get(2), null, context.descendants.get(1)),
 				fakeInfo(context.descendants.get(3), null, null)
 		), neighbors);
 	}
 	@Test
 	public void updateMainStatus() {
 		ThreadFragment fragment = new ThreadFragment();
 		fragment.mainStatus = Status.ofFake("123456", "original text", Instant.EPOCH);
 		Status update1 = Status.ofFake("123456", "updated text", Instant.EPOCH);
 		update1.editedAt = Instant.ofEpochSecond(1);
 		fragment.updatedStatus = update1;
 		StatusUpdatedEvent event1 = (StatusUpdatedEvent) fragment.updateMainStatus();
 		assertEquals("fired update event", update1, event1.status);
 		assertEquals("updated main status", update1, fragment.mainStatus);
 		Status update2 = Status.ofFake("123456", "updated text", Instant.EPOCH);
 		update2.favouritesCount = 123;
 		fragment.updatedStatus = update2;
 		StatusCountersUpdatedEvent event2 = (StatusCountersUpdatedEvent) fragment.updateMainStatus();
 		assertEquals("only fired counter update event", update2.id, event2.id);
 		assertEquals("updated counter is correct", 123, event2.favorites);
 		assertEquals("updated main status", update2, fragment.mainStatus);
 	}
 	@Test
 	public void sortStatusContext() {
 		StatusContext context = new StatusContext();
 		context.ancestors = List.of(
 				fakeStatus("younger ancestor", "oldest ancestor"),
 				fakeStatus("oldest ancestor", null)
 		);
 		context.descendants = List.of(
 				fakeStatus("reply to first reply", "first reply"),
 				fakeStatus("third level reply", "reply to first reply"),
 				fakeStatus("first reply", "main status"),
 				fakeStatus("another reply", "main status")
 		);
 		ThreadFragment.sortStatusContext(
 				fakeStatus("main status", "younger ancestor"),
 				context
 		);
 		List<Status> expectedAncestors = List.of(
 				fakeStatus("oldest ancestor", null),
 				fakeStatus("younger ancestor", "oldest ancestor")
 		);
 		List<Status> expectedDescendants = List.of(
 				fakeStatus("first reply", "main status"),
 				fakeStatus("reply to first reply", "first reply"),
 				fakeStatus("third level reply", "reply to first reply"),
 				fakeStatus("another reply", "main status")
 		);
 		// TODO: ??? i have no idea how this code works. it certainly doesn't return what i'd expect
 	}
 }
--- a/mastodon/src/androidTest/java/org/joinmastodon/android/ui/utils/UiUtilsTest.java
+++ b/mastodon/src/androidTest/java/org/joinmastodon/android/ui/utils/UiUtilsTest.java
@@ -0,0 +1,106 @@
 package org.joinmastodon.android.ui.utils;
 import static org.junit.Assert.*;
 import android.util.Pair;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Instance;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import java.util.Optional;
 public class UiUtilsTest {
 	@BeforeClass
 	public static void createDummySession() {
 		Instance dummyInstance = new Instance();
 		dummyInstance.uri = "test.tld";
 		Account dummyAccount = new Account();
 		dummyAccount.id = "123456";
 		AccountSessionManager.getInstance().addAccount(dummyInstance, null, dummyAccount, null, null);
 	}
 	@AfterClass
 	public static void cleanUp() {
 		AccountSessionManager.getInstance().removeAccount("test.tld_123456");
 	}
 	@Test
 	public void parseFediverseHandle() {
 		assertEquals(
 				Optional.of(Pair.create("megalodon", Optional.of("floss.social"))),
 				UiUtils.parseFediverseHandle("megalodon@floss.social")
 		);
 		assertEquals(
 				Optional.of(Pair.create("megalodon", Optional.of("floss.social"))),
 				UiUtils.parseFediverseHandle("@megalodon@floss.social")
 		);
 		assertEquals(
 				Optional.of(Pair.create("megalodon", Optional.empty())),
 				UiUtils.parseFediverseHandle("@megalodon")
 		);
 		assertEquals(
 				Optional.of(Pair.create("megalodon", Optional.of("floss.social"))),
 				UiUtils.parseFediverseHandle("mailto:megalodon@floss.social")
 		);
 		assertEquals(
 				Optional.empty(),
 				UiUtils.parseFediverseHandle("megalodon")
 		);
 		assertEquals(
 				Optional.empty(),
 				UiUtils.parseFediverseHandle("this is not a fedi handle")
 		);
 		assertEquals(
 				Optional.empty(),
 				UiUtils.parseFediverseHandle("not@a-domain")
 		);
 	}
 	@Test
 	public void acctMatches() {
 		assertTrue("local account, domain not specified", UiUtils.acctMatches(
 				"test.tld_123456",
 				"someone",
 				"someone",
 				null
 		));
 		assertTrue("domain not specified", UiUtils.acctMatches(
 				"test.tld_123456",
 				"someone@somewhere.social",
 				"someone",
 				null
 		));
 		assertTrue("local account, domain specified, different casing", UiUtils.acctMatches(
 				"test.tld_123456",
 				"SomeOne",
 				"someone",
 				"Test.TLD"
 		));
 		assertFalse("username doesn't match", UiUtils.acctMatches(
 				"test.tld_123456",
 				"someone-else@somewhere.social",
 				"someone",
 				"somewhere.social"
 		));
 		assertFalse("domain doesn't match", UiUtils.acctMatches(
 				"test.tld_123456",
 				"someone@somewhere.social",
 				"someone",
 				"somewhere.else"
 		));
 	}
 }
--- a/mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
+++ b/mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
@@ -0,0 +1,81 @@
 package org.joinmastodon.android.utils;
 import static org.joinmastodon.android.model.Filter.FilterAction.*;
 import static org.joinmastodon.android.model.Filter.FilterContext.*;
 import static org.junit.Assert.*;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.junit.Test;
 import java.time.Instant;
 import java.util.EnumSet;
 import java.util.List;
 public class StatusFilterPredicateTest {
    private static final Filter hideMeFilter = new Filter(), warnMeFilter = new Filter();
    private static final List<Filter> allFilters = List.of(hideMeFilter, warnMeFilter);
    private static final Status
            hideInHomePublic = Status.ofFake(null, "hide me, please", Instant.now()),
            warnInHomePublic = Status.ofFake(null, "display me with a warning", Instant.now());
    static {
        hideMeFilter.phrase = "hide me";
        hideMeFilter.filterAction = HIDE;
        hideMeFilter.context = EnumSet.of(PUBLIC, HOME);
        warnMeFilter.phrase = "warning";
        warnMeFilter.filterAction = WARN;
        warnMeFilter.context = EnumSet.of(PUBLIC, HOME);
    }
    @Test
    public void testHide() {
        assertFalse("should not pass because matching filter applies to given context",
                new StatusFilterPredicate(allFilters, HOME).test(hideInHomePublic));
    }
    @Test
    public void testHideRegardlessOfContext() {
        assertTrue("filters without context should always pass",
                new StatusFilterPredicate(allFilters, null).test(hideInHomePublic));
    }
    @Test
    public void testHideInDifferentContext() {
        assertTrue("should pass because matching filter does not apply to given context",
                new StatusFilterPredicate(allFilters, THREAD).test(hideInHomePublic));
    }
    @Test
    public void testHideWithWarningText() {
        assertTrue("should pass because matching filter is for warnings",
                new StatusFilterPredicate(allFilters, HOME).test(warnInHomePublic));
    }
    @Test
    public void testWarn() {
        assertFalse("should not pass because filter applies to given context",
                new StatusFilterPredicate(allFilters, HOME, WARN).test(warnInHomePublic));
    }
    @Test
    public void testWarnRegardlessOfContext() {
        assertTrue("filters without context should always pass",
                new StatusFilterPredicate(allFilters, null, WARN).test(warnInHomePublic));
    }
    @Test
    public void testWarnInDifferentContext() {
        assertTrue("should pass because filter does not apply to given context",
                new StatusFilterPredicate(allFilters, THREAD, WARN).test(warnInHomePublic));
    }
    @Test
    public void testWarnWithHideText() {
        assertTrue("should pass because matching filter is for hiding",
                new StatusFilterPredicate(allFilters, HOME, WARN).test(hideInHomePublic));
    }
 }
--- a/mastodon/src/github/AndroidManifest.xml
+++ b/mastodon/src/github/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 	package="org.joinmastodon.android">
 	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
--- a/mastodon/src/main/AndroidManifest.xml
+++ b/mastodon/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 	package="org.joinmastodon.android">
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
@@ -17,6 +16,9 @@
 			<action android:name="android.intent.action.PROCESS_TEXT" />
 			<data android:mimeType="text/plain" />
 		</intent>
 		<intent>
 			<action android:name="android.intent.action.TRANSLATE" />
 		</intent>
 	</queries>
 	<application
@@ -36,6 +38,22 @@
 				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
 		</activity>
 		<activity
 			android:name=".PanicResponderActivity"
 			android:exported="true"
 			android:launchMode="singleInstance"
 			android:noHistory="true"
 			android:theme="@android:style/Theme.NoDisplay">
 			<intent-filter>
 				<action android:name="info.guardianproject.panic.action.TRIGGER" />
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
 		</activity>
 		<activity
 			android:name=".ExitActivity"
 			android:exported="false"
 			android:theme="@android:style/Theme.NoDisplay" />
 		<activity android:name=".OAuthActivity" android:exported="true" android:configChanges="orientation|screenSize" android:launchMode="singleTask">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW"/>
@@ -44,7 +62,8 @@
 				<data android:scheme="megalodon-android-auth" android:host="callback"/>
 			</intent-filter>
 		</activity>
-		<activity android:name=".ExternalShareActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize">
+		<activity android:name=".ExternalShareActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize"
 			android:theme="@style/TransparentDialog">
 			<intent-filter>
 				<action android:name="android.intent.action.SEND"/>
 				<category android:name="android.intent.category.DEFAULT"/>
--- a/mastodon/src/main/assets/blocks.tsv
+++ b/mastodon/src/main/assets/blocks.tsv
@@ -1,89 +0,0 @@
 #	lists.d Mastodon Blocklist	(c) 2022 Greyhat Academy	LICENSED  UNDER: CC-BY-NC-SA 4.0
 #	https://raw.githubusercontent.com/greyhat-academy/lists.d/main/mastodon.domains.block.list.tsv
 #	This list contains domains of toxic mastodon instances
 #	Last-Modified:	1672044500
 #	gab - a neonazi social network
 gab.ai
 gab.com
 gab.protohype.net
 #	consequence-free speech
 social.unzensiert.to
 freeatlantis.com
 #	reactionary bigotry and hatespeech against magrinalized groups
 poa.st
 freespeechextremist.com
 rdrama.cc
 outpoa.st
 anime.website
 gameliberty.club
 social.byoblu.com
 yggdrasil.social
 smuglo.li
 dogeposting.social
 unsafe.space
 freezepeach.xyz
 #	+ CSAM
 rojogato.com
 #	antivaxxer shitposting & fearmongering
 shadowsocial.org
 #	Kiwifarms
 kiwifarms.net
 kiwifarms.cc
 kiwifarms.is
 kiwifarms.pleroma.net
 # https://mastodon.art/@Curator/109649354849593592
 poa.st antisemitic racist homophobic
 nicecrew.digital antisemitic
 beefyboys.win antisemitic racist homophobic harassment
 cawfee.club antisemitic racist homophobic
 comfyboy.club antisemitic racist homophobic
 freespeechextremist.com racist homophobic
 cum.salon racist misogynist
 bae.st racist
 natehiggers.online racist
 rapemeat.solutions misogynist
 rapist.town misogynist
 rapefeminists.network misogynist
 kiwifarms.cc harassment
 noagendasocial.com noagenda
 posting.lolicon.rocks underage
 urchan.org harassment homophobic racist
 ryona.agency harassment
 yggdrasil.social antisemitic homophobic racist
 genderheretics.xyz transphobic
 baraag.net underage
 lolison.top underage
 shota.house underage
 shota.social underage
 aethy.com underage
 taullo.social underage
 childpawn.shop underage
 posting.lolicon.rocks underage
 loli.best underage
 gothloli.club underage
 smuglo.li underage
 youjo.love underage
 pedo.school underage
 lolison.network underage
 freak.university underage
 mirr0r.city underage
 xhais.love underage
 refusal.biz underage
 refusal.llc underage
 mirr0r.city underage
 nnia.space underage
 ignorelist.com malicious
 repl.co malicious
 # custom
 pawoo.net csam
--- a/mastodon/src/main/assets/blocks.txt
+++ b/mastodon/src/main/assets/blocks.txt
@@ -0,0 +1,171 @@
 13bells.com
 4aem.com
 aethy.com
 anime.website
 annihilation.social
 anon-kenkai.com
 asbestos.cafe
 bae.st
 bajax.us
 banepo.st
 baraag.net
 beefyboys.win
 beepboop.ga
 berserker.town
 bikeshed.party
 boks.moe
 brainsoap.net
 breastmilk.club
 brighteon.social
 cawfee.club
 clew.lol
 clubcyberia.co
 collapsitarian.io
 comfyboy.club
 contrapointsfan.club
 cum.camp
 cum.salon
 cybercriminal.eu
 darknight-coffee.org
 dembased.xyz
 desupost.soy
 detroitriotcity.com
 eatthebugs.social
 eientei.org
 elementality.org
 eveningzoo.club
 firedragonstudios.com
 firefaithfellowship.com
 fluf.club
 foxfam.club
 freak.university
 freeatlantis.com
 freecumextremist.com
 freedomstrike.org
 freesoftwareextremist.com
 freespeech.group
 freespeechextremist.com
 freetalklive.com
 froth.zone
 fulltermprivacy.com
 gameliberty.club
 gearlandia.haus
 genderheretics.xyz
 geofront.rocks
 gleasonator.com
 glee.li
 glindr.org
 goyim.app
 goyslop.cafe
 haeder.net
 handholding.io
 hidamari.apartments
 hitchhiker.social
 hunk.city
 iddqd.social
 intkos.link
 justicewarrior.social
 kawa-kun.com
 kitsunemimi.club
 kiwifarms.cc
 kompost.cz
 kurosawa.moe
 leafposter.club
 leftychan.net
 lewdieheaven.com
 liberdon.com
 ligma.pro
 lizards.live
 lolicon.rocks
 lolison.top
 lovingexpressions.net
 lucasvl.nl
 mahodou.moe
 makemysarcophagus.com
 maladaptive.art
 masochi.st
 mastinator.com
 merovingian.club
 midwaytrades.com
 mirr0r.city
 moa.st
 mouse.services
 mugicha.club
 narrativerry.xyz
 natehiggers.online
 neckbeard.xyz
 needs.vodka
 neenster.org
 nicecrew.digital
 nnia.space
 noagendasocial.com
 noagendasocial.nl
 noagendatube.com
 nobodyhasthe.biz
 nukem.biz
 obo.sh
 onionfarms.org
 outpoa.st
 pawlicker.com
 pawoo.net
 pedo.school
 piazza.today
 pibvt.net
 pieville.net
 pisskey.io
 plagu.ee
 pmth.us
 poa.st
 poast.org
 poast.tv
 poster.place
 prospeech.space
 quodverum.com
 rakket.app
 rapemeat.solutions
 rdrama.cc
 rebelbase.site
 retardedniggers.forsale
 rojogato.com
 ryona.agency
 schwartzwelt.xyz
 seal.cafe
 shigusegubu.club
 shitpost.cloud
 shitposter.club
 shota.house
 silliness.observer
 skinheads.eu
 skinheads.io
 skinheads.social
 skinheads.uk
 skippers-bin.com
 skyshanty.xyz
 slash.cl
 sleepy.cafe
 smuglo.li
 sneed.social
 sonichu.com
 spinster.xyz
 springbo.cc
 starnix.network
 stereophonic.space
 strelizia.net
 syspxl.xyz
 tastingtraffic.net
 teci.world
 theapex.social
 thepostearthdestination.com
 tkammer.de
 trumpislovetrumpis.life
 truthsocial.co.in
 urchan.org
 varishangout.net
 whinge.house
 whinge.town
 wideboys.org
 wolfgirl.bar
 xn--p1abe3d.xn--80asehdb
 yggdrasil.social
 youjo.love
 zztails.gay
--- a/mastodon/src/main/java/org/joinmastodon/android/ExitActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ExitActivity.java
@@ -0,0 +1,24 @@
 package org.joinmastodon.android;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 public class ExitActivity extends Activity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        finishAndRemoveTask();
    }
    public static void exit(Context context) {
        Intent intent = new Intent(context, ExitActivity.class);
        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
        context.startActivity(intent);
    }
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
@@ -3,20 +3,24 @@ package org.joinmastodon.android;
 import android.app.Fragment;
 import android.content.ClipData;
 import android.content.Intent;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Pair;
 import android.widget.Toast;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.jsoup.internal.StringUtil;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.BiConsumer;
 import androidx.annotation.Nullable;
 import me.grishka.appkit.FragmentStackActivity;
@@ -27,18 +31,43 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		UiUtils.setUserPreferredTheme(this);
 		super.onCreate(savedInstanceState);
 		if(savedInstanceState==null){
 			Optional<String> text = Optional.ofNullable(getIntent().getStringExtra(Intent.EXTRA_TEXT));
 			Optional<Pair<String, Optional<String>>> fediHandle = text.flatMap(UiUtils::parseFediverseHandle);
 			boolean isFediUrl = text.map(UiUtils::looksLikeFediverseUrl).orElse(false);
 			boolean isOpenable = isFediUrl || fediHandle.isPresent();
 			List<AccountSession> sessions=AccountSessionManager.getInstance().getLoggedInAccounts();
-			if(sessions.isEmpty()){
+			if (sessions.isEmpty()){
 				Toast.makeText(this, R.string.err_not_logged_in, Toast.LENGTH_SHORT).show();
 				finish();
-			}else if(sessions.size()==1){
+			} else if (isOpenable || sessions.size() > 1) {
 				AccountSwitcherSheet sheet = new AccountSwitcherSheet(this, null, true, isOpenable);
 				if (isOpenable) sheet.setOnClick((accountId, open) -> {
 					if (open && text.isPresent()) {
 						BiConsumer<Class<? extends Fragment>, Bundle> callback = (clazz, args) -> {
 							if (clazz == null) {
 								Toast.makeText(this, R.string.sk_open_in_app_failed, Toast.LENGTH_SHORT).show();
 								// TODO: do something about the window getting leaked
 								sheet.dismiss();
 								finish();
 								return;
 							}
 							args.putString("fromExternalShare", clazz.getSimpleName());
 							Intent intent = new Intent(this, MainActivity.class);
 							intent.putExtras(args);
 							finish();
 							startActivity(intent);
 						};
 						if (isFediUrl) UiUtils.lookupURL(this, accountId, text.get(), false, callback);
 						else UiUtils.lookupAccountHandle(this, accountId, fediHandle.get(), callback);
 					} else {
 						openComposeFragment(accountId);
 					}
 				});
 				sheet.show();
 			} else if (sessions.size() == 1) {
 				openComposeFragment(sessions.get(0).getID());
 			}else{
 				getWindow().setBackgroundDrawable(new ColorDrawable(0xff000000));
 				UiUtils.pickAccount(this, null, R.string.choose_account, 0,
 						session -> openComposeFragment(session.getID()),
 						b -> b.setOnCancelListener(d -> finish())
 				);
 			}
 		}
 	}
@@ -51,9 +80,15 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		String subject = "";
 		if (intent.hasExtra(Intent.EXTRA_SUBJECT)) {
 			subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
-			if (!subject.isBlank()) builder.append(subject).append("\n\n");
+			if (!StringUtil.isBlank(subject)) builder.append(subject).append("\n\n");
 		}
 		if (intent.hasExtra(Intent.EXTRA_TEXT)) {
 			String extra = intent.getStringExtra(Intent.EXTRA_TEXT);
 			if (!StringUtil.isBlank(extra)) {
 				if (extra.startsWith(subject)) extra = extra.substring(subject.length()).trim();
 				builder.append(extra).append("\n\n");
 			}
 		}
 		if (intent.hasExtra(Intent.EXTRA_TEXT)) builder.append(intent.getStringExtra(Intent.EXTRA_TEXT)).append("\n");
 		String text=builder.toString();
 		List<Uri> mediaUris;
 		if(Intent.ACTION_SEND.equals(intent.getAction())){
@@ -80,8 +115,7 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		args.putString("account", accountID);
 		if(!TextUtils.isEmpty(text))
 			args.putString("prefilledText", text);
-		if(!subject.isBlank())
+		args.putInt("selectionStart", StringUtil.isBlank(subject) ? 0 : subject.length());
 			args.putInt("selectionEnd", subject.length());
 		if(mediaUris!=null && !mediaUris.isEmpty())
 			args.putParcelableArrayList("mediaAttachments", toArrayList(mediaUris));
 		Fragment fragment=new ComposeFragment();
--- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -8,6 +8,7 @@ import android.content.SharedPreferences;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.TimelineDefinition;
 import java.lang.reflect.Type;
@@ -44,16 +45,27 @@ public class GlobalUserPreferences{
 	public static boolean collapseLongPosts;
 	public static boolean spectatorMode;
 	public static boolean autoHideFab;
 	public static boolean replyLineAboveHeader;
 	public static boolean compactReblogReplyLine;
 	public static boolean confirmBeforeReblog;
 	public static String publishButtonText;
 	public static ThemePreference theme;
 	public static ColorPreference color;
 	private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType();
 	private final static Type pinnedTimelinesType = new TypeToken<Map<String, List<TimelineDefinition>>>() {}.getType();
 	private final static Type accountsDefaultContentTypesType = new TypeToken<Map<String, ContentType>>() {}.getType();
 	public static Map<String, List<String>> recentLanguages;
 	public static Map<String, List<TimelineDefinition>> pinnedTimelines;
 	public static Set<String> accountsWithLocalOnlySupport;
 	public static Set<String> accountsInGlitchMode;
 	public static Set<String> accountsWithContentTypesEnabled;
 	public static Map<String, ContentType> accountsDefaultContentTypes;
 	/**
 	 * Pleroma
 	 */
 	public static String replyVisibility;
 	private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
@@ -65,6 +77,16 @@ public class GlobalUserPreferences{
 		catch (JsonSyntaxException ignored) { return orElse; }
 	}
 	public static void removeAccount(String accountId) {
 		recentLanguages.remove(accountId);
 		pinnedTimelines.remove(accountId);
 		accountsInGlitchMode.remove(accountId);
 		accountsWithLocalOnlySupport.remove(accountId);
 		accountsWithContentTypesEnabled.remove(accountId);
 		accountsDefaultContentTypes.remove(accountId);
 		save();
 	}
 	public static void load(){
 		SharedPreferences prefs=getPrefs();
 		playGifs=prefs.getBoolean("playGifs", true);
@@ -93,12 +115,18 @@ public class GlobalUserPreferences{
 		collapseLongPosts=prefs.getBoolean("collapseLongPosts", true);
 		spectatorMode=prefs.getBoolean("spectatorMode", false);
 		autoHideFab=prefs.getBoolean("autoHideFab", true);
 		replyLineAboveHeader=prefs.getBoolean("replyLineAboveHeader", true);
 		compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true);
 		confirmBeforeReblog=prefs.getBoolean("confirmBeforeReblog", false);
 		publishButtonText=prefs.getString("publishButtonText", "");
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 		recentLanguages=fromJson(prefs.getString("recentLanguages", null), recentLanguagesType, new HashMap<>());
 		pinnedTimelines=fromJson(prefs.getString("pinnedTimelines", null), pinnedTimelinesType, new HashMap<>());
 		accountsWithLocalOnlySupport=prefs.getStringSet("accountsWithLocalOnlySupport", new HashSet<>());
 		accountsInGlitchMode=prefs.getStringSet("accountsInGlitchMode", new HashSet<>());
 		replyVisibility=prefs.getString("replyVisibility", null);
 		accountsWithContentTypesEnabled=prefs.getStringSet("accountsWithContentTypesEnabled", new HashSet<>());
 		accountsDefaultContentTypes=fromJson(prefs.getString("accountsDefaultContentTypes", null), accountsDefaultContentTypesType, new HashMap<>());
 		try {
 			color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PINK.name()));
@@ -134,14 +162,20 @@ public class GlobalUserPreferences{
 				.putBoolean("collapseLongPosts", collapseLongPosts)
 				.putBoolean("spectatorMode", spectatorMode)
 				.putBoolean("autoHideFab", autoHideFab)
 				.putBoolean("compactReblogReplyLine", compactReblogReplyLine)
 				.putString("publishButtonText", publishButtonText)
 				.putBoolean("bottomEncoding", bottomEncoding)
 				.putBoolean("replyLineAboveHeader", replyLineAboveHeader)
 				.putBoolean("confirmBeforeReblog", confirmBeforeReblog)
 				.putInt("theme", theme.ordinal())
 				.putString("color", color.name())
 				.putString("recentLanguages", gson.toJson(recentLanguages))
 				.putString("pinnedTimelines", gson.toJson(pinnedTimelines))
 				.putStringSet("accountsWithLocalOnlySupport", accountsWithLocalOnlySupport)
 				.putStringSet("accountsInGlitchMode", accountsInGlitchMode)
 				.putString("replyVisibility", replyVisibility)
 				.putStringSet("accountsWithContentTypesEnabled", accountsWithContentTypesEnabled)
 				.putString("accountsDefaultContentTypes", gson.toJson(accountsDefaultContentTypes))
 				.apply();
 	}
@@ -162,4 +196,3 @@ public class GlobalUserPreferences{
 		DARK
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
@@ -2,11 +2,14 @@ package org.joinmastodon.android;
 import android.Manifest;
 import android.app.Fragment;
 import android.app.assist.AssistContent;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.session.AccountSession;
@@ -20,12 +23,13 @@ import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 import androidx.annotation.Nullable;
 import me.grishka.appkit.FragmentStackActivity;
-public class MainActivity extends FragmentStackActivity{
+public class MainActivity extends FragmentStackActivity implements ProvidesAssistContent {
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState){
 		UiUtils.setUserPreferredTheme(this);
@@ -35,10 +39,18 @@ public class MainActivity extends FragmentStackActivity{
 			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
 				showFragmentClearingBackStack(new CustomWelcomeFragment());
 			}else{
 				AccountSessionManager.getInstance().maybeUpdateLocalInfo();
 				AccountSession session;
 				Bundle args=new Bundle();
 				Intent intent=getIntent();
 				if(intent.hasExtra("fromExternalShare")) {
 					AccountSessionManager.getInstance()
 							.setLastActiveAccountID(intent.getStringExtra("account"));
 					AccountSessionManager.getInstance().maybeUpdateLocalInfo(
 							AccountSessionManager.getInstance().getLastActiveAccount());
 					showFragmentForExternalShare(intent.getExtras());
 					return;
 				}
 				boolean fromNotification = intent.getBooleanExtra("fromNotification", false);
 				boolean hasNotification = intent.hasExtra("notification");
 				if(fromNotification){
@@ -52,6 +64,7 @@ public class MainActivity extends FragmentStackActivity{
 				}else{
 					session=AccountSessionManager.getInstance().getLastActiveAccount();
 				}
 				AccountSessionManager.getInstance().maybeUpdateLocalInfo(session);
 				args.putString("account", session.getID());
 				Fragment fragment=session.activated ? new HomeFragment() : new AccountActivationFragment();
 				fragment.setArguments(args);
@@ -75,11 +88,12 @@ public class MainActivity extends FragmentStackActivity{
 	@Override
 	protected void onNewIntent(Intent intent){
 		super.onNewIntent(intent);
-		if(intent.getBooleanExtra("fromNotification", false)){
+		AccountSessionManager.getInstance().maybeUpdateLocalInfo();
 		if (intent.hasExtra("fromExternalShare")) showFragmentForExternalShare(intent.getExtras());
 		else if (intent.getBooleanExtra("fromNotification", false)) {
 			String accountID=intent.getStringExtra("accountID");
 			AccountSession accountSession;
 			try{
-				accountSession=AccountSessionManager.getInstance().getAccount(accountID);
+				AccountSessionManager.getInstance().getAccount(accountID);
 			}catch(IllegalStateException x){
 				return;
 			}
@@ -103,23 +117,24 @@ public class MainActivity extends FragmentStackActivity{
 	}
 	private void showFragmentForNotification(Notification notification, String accountID){
 		Fragment fragment;
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		args.putBoolean("_can_go_back", true);
 		try{
 			notification.postprocess();
 		}catch(ObjectValidationException x){
 			Log.w("MainActivity", x);
 			return;
 		}
-		if(notification.status!=null){
+		UiUtils.showFragmentForNotification(this, notification, accountID, null);
-			fragment=new ThreadFragment();
+	}
-			args.putParcelable("status", Parcels.wrap(notification.status));
+
-		}else{
+	private void showFragmentForExternalShare(Bundle args) {
-			fragment=new ProfileFragment();
+		String clazz = args.getString("fromExternalShare");
-			args.putParcelable("profileAccount", Parcels.wrap(notification.account));
+		Fragment fragment = switch (clazz) {
-		}
+			case "ThreadFragment" -> new ThreadFragment();
 			case "ProfileFragment" -> new ProfileFragment();
 			default -> null;
 		};
 		if (fragment == null) return;
 		args.putBoolean("_can_go_back", true);
 		fragment.setArguments(args);
 		showFragment(fragment);
 	}
@@ -153,18 +168,40 @@ public class MainActivity extends FragmentStackActivity{
 				(fragmentContainers.get(fragmentContainers.size() - 1)).getId()
 		);
 		Bundle currentArgs = currentFragment.getArguments();
-		if (this.fragmentContainers.size() == 1
+		if (fragmentContainers.size() != 1
-				&& currentArgs != null
+				|| currentArgs == null
-				&& currentArgs.getBoolean("_can_go_back", false)
+				|| !currentArgs.getBoolean("_can_go_back", false)) {
-				&& currentArgs.containsKey("account")) {
+			super.onBackPressed();
 			return;
 		}
 		if (currentArgs.getBoolean("_finish_on_back", false)) {
 			finish();
 		} else if (currentArgs.containsKey("account")) {
 			Bundle args = new Bundle();
 			args.putString("account", currentArgs.getString("account"));
-			args.putString("tab", "notifications");
+			if (getIntent().getBooleanExtra("fromNotification", false)) {
 				args.putString("tab", "notifications");
 			}
 			Fragment fragment=new HomeFragment();
 			fragment.setArguments(args);
 			showFragmentClearingBackStack(fragment);
 		} else {
 			super.onBackPressed();
 		}
 	}
 	public Fragment getCurrentFragment() {
 		for (int i = fragmentContainers.size() - 1; i >= 0; i--) {
 			FrameLayout fl = fragmentContainers.get(i);
 			if (fl.getVisibility() == View.VISIBLE) {
 				return getFragmentManager().findFragmentById(fl.getId());
 			}
 		}
 		return null;
 	}
 	@Override
 	public void onProvideAssistContent(AssistContent assistContent) {
 		super.onProvideAssistContent(assistContent);
 		Fragment fragment = getCurrentFragment();
 		if (fragment != null) callFragmentToProvideAssistContent(fragment, assistContent);
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/PanicResponderActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/PanicResponderActivity.java
@@ -0,0 +1,49 @@
 package org.joinmastodon.android;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 public class PanicResponderActivity extends Activity {
    public static final String PANIC_TRIGGER_ACTION = "info.guardianproject.panic.action.TRIGGER";
    @Override
    protected void onCreate(final Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        final Intent intent = getIntent();
        if (intent != null && PANIC_TRIGGER_ACTION.equals(intent.getAction())) {
            AccountSessionManager.getInstance().getLoggedInAccounts().forEach(accountSession -> logOut(accountSession.getID()));
            ExitActivity.exit(this);
        }
        finishAndRemoveTask();
    }
    private void logOut(String accountID){
        AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
        new RevokeOauthToken(session.app.clientId, session.app.clientSecret, session.token.accessToken)
                .setCallback(new Callback<>(){
                    @Override
                    public void onSuccess(Object result){
                        onLoggedOut(accountID);
                    }
                    @Override
                    public void onError(ErrorResponse error){
                        onLoggedOut(accountID);
                    }
                })
                .exec(accountID);
    }
    private void onLoggedOut(String accountID){
        AccountSessionManager.getInstance().removeAccount(accountID);
    }
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
@@ -5,6 +5,7 @@ import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.RemoteInput;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -16,15 +17,28 @@ import android.util.Log;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.requests.notifications.GetNotificationByID;
 import org.joinmastodon.android.api.requests.statuses.CreateStatus;
 import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
 import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
 import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.NotificationReceivedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Mention;
 import org.joinmastodon.android.model.NotificationAction;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushNotification;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import me.grishka.appkit.api.Callback;
@@ -37,10 +51,14 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 	private static final String TAG="PushNotificationReceive";
 	public static final int NOTIFICATION_ID=178;
 	private static final String ACTION_KEY_TEXT_REPLY = "ACTION_KEY_TEXT_REPLY";
 	private static final int SUMMARY_ID = 791;
 	private static int notificationId = 0;
 	@Override
 	public void onReceive(Context context, Intent intent){
 		UiUtils.setUserPreferredTheme(context);
 		if(BuildConfig.DEBUG){
 			Log.e(TAG, "received: "+intent);
 			Bundle extras=intent.getExtras();
@@ -70,6 +88,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 						}
 						String accountID=account.getID();
 						PushNotification pn=AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().decryptNotification(k, p, s);
 						E.post(new NotificationReceivedEvent(accountID, pn.notificationId+""));
 						new GetNotificationByID(pn.notificationId+"")
 								.setCallback(new Callback<>(){
 									@Override
@@ -91,6 +110,35 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				Log.w(TAG, "onReceive: invalid push notification format");
 			}
 		}
 		if(intent.getBooleanExtra("fromNotificationAction", false)){
 			String accountID=intent.getStringExtra("accountID");
 			int notificationId=intent.getIntExtra("notificationId", -1);
 			if (notificationId >= 0){
 				NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 				notificationManager.cancel(accountID, notificationId);
 			}
 			if(intent.hasExtra("notification")){
 				org.joinmastodon.android.model.Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
 				String statusID=notification.status.id;
 				if (statusID != null) {
 					AccountSessionManager accountSessionManager = AccountSessionManager.getInstance();
 					Preferences preferences = accountSessionManager.getAccount(accountID).preferences;
 					switch (NotificationAction.values()[intent.getIntExtra("notificationAction", 0)]) {
 						case FAVORITE -> new SetStatusFavorited(statusID, true).exec(accountID);
 						case BOOKMARK -> new SetStatusBookmarked(statusID, true).exec(accountID);
 						case REBLOG -> new SetStatusReblogged(notification.status.id, true, preferences.postingDefaultVisibility).exec(accountID);
 						case UNDO_REBLOG -> new SetStatusReblogged(notification.status.id, false, preferences.postingDefaultVisibility).exec(accountID);
 						case REPLY -> handleReplyAction(context, accountID, intent, notification, notificationId, preferences);
 						default -> Log.w(TAG, "onReceive: Failed to get NotificationAction");
 					}
 				}
 			}else{
 				Log.e(TAG, "onReceive: Failed to load notification");
 			}
 		}
 	}
 	private void notify(Context context, PushNotification pn, String accountID, org.joinmastodon.android.model.Notification notification){
@@ -142,7 +190,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
-				.setColor(context.getColor(R.color.primary_700));
+				.setColor(UiUtils.getThemeColor(context, android.R.attr.colorAccent));
 		if (!GlobalUserPreferences.uniformNotificationIcon) {
 			builder.setSmallIcon(switch (pn.notificationType) {
@@ -164,6 +212,123 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		if(AccountSessionManager.getInstance().getLoggedInAccounts().size()>1){
 			builder.setSubText(accountName);
 		}
-		nm.notify(accountID, GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : notificationId++, builder.build());
+
 		int id = GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : notificationId++;
 		if (notification != null){
 			switch (pn.notificationType){
 				case MENTION, STATUS -> {
 					if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
 						builder.addAction(buildReplyAction(context, id, accountID, notification));
 					}
 					builder.addAction(buildNotificationAction(context, id, accountID, notification,  context.getString(R.string.button_favorite), NotificationAction.FAVORITE));
 					builder.addAction(buildNotificationAction(context, id, accountID, notification, context.getString(R.string.add_bookmark), NotificationAction.BOOKMARK));
 					if(notification.status.visibility != StatusPrivacy.DIRECT) {
 						builder.addAction(buildNotificationAction(context, id, accountID, notification,  context.getString(R.string.button_reblog), NotificationAction.REBLOG));
 					}
 				}
 				case UPDATE -> {
 					if(notification.status.reblogged)
 						builder.addAction(buildNotificationAction(context, id, accountID, notification,  context.getString(R.string.sk_undo_reblog), NotificationAction.UNDO_REBLOG));
 				}
 			}
 		}
 		nm.notify(accountID, id, builder.build());
 	}
 	private Notification.Action buildNotificationAction(Context context, int notificationId, String accountID, org.joinmastodon.android.model.Notification notification, String title, NotificationAction action){
 		Intent notificationIntent=new Intent(context, PushNotificationReceiver.class);
 		notificationIntent.putExtra("notificationId", notificationId);
 		notificationIntent.putExtra("fromNotificationAction", true);
 		notificationIntent.putExtra("accountID", accountID);
 		notificationIntent.putExtra("notificationAction", action.ordinal());
 		notificationIntent.putExtra("notification", Parcels.wrap(notification));
 		PendingIntent actionPendingIntent = PendingIntent.getBroadcast(context, new Random().nextInt(), notificationIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_ONE_SHOT);
 		return new Notification.Action.Builder(null, title, actionPendingIntent).build();
 	}
 	private Notification.Action buildReplyAction(Context context, int notificationId, String accountID, org.joinmastodon.android.model.Notification notification){
 		String replyLabel = context.getResources().getString(R.string.button_reply);
 		RemoteInput remoteInput = new RemoteInput.Builder(ACTION_KEY_TEXT_REPLY)
 				.setLabel(replyLabel)
 				.build();
 		Intent notificationIntent=new Intent(context, PushNotificationReceiver.class);
 		notificationIntent.putExtra("notificationId", notificationId);
 		notificationIntent.putExtra("fromNotificationAction", true);
 		notificationIntent.putExtra("accountID", accountID);
 		notificationIntent.putExtra("notificationAction", NotificationAction.REPLY.ordinal());
 		notificationIntent.putExtra("notification", Parcels.wrap(notification));
 		int flags = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_UPDATE_CURRENT : PendingIntent.FLAG_UPDATE_CURRENT;
 		PendingIntent replyPendingIntent = PendingIntent.getBroadcast(context, new Random().nextInt(), notificationIntent,flags);
 		return new Notification.Action.Builder(null, replyLabel, replyPendingIntent).addRemoteInput(remoteInput).build();
 	}
 	private void handleReplyAction(Context context, String accountID, Intent intent, org.joinmastodon.android.model.Notification notification, int notificationId, Preferences preferences) {
 		Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
 		if (remoteInput == null) {
 			Log.e(TAG, "handleReplyAction: Could not get reply input");
 			return;
 		}
 		CharSequence input = remoteInput.getCharSequence(ACTION_KEY_TEXT_REPLY);
 		// copied from ComposeFragment - TODO: generalize?
 		ArrayList<String> mentions=new ArrayList<>();
 		Status status = notification.status;
 		String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
 		if(!status.account.id.equals(ownID))
 			mentions.add('@'+status.account.acct);
 		for(Mention mention:status.mentions){
 			if(mention.id.equals(ownID))
 				continue;
 			String m='@'+mention.acct;
 			if(!mentions.contains(m))
 				mentions.add(m);
 		}
 		String initialText=mentions.isEmpty() ? "" : TextUtils.join(" ", mentions)+" ";
 		CreateStatus.Request req=new CreateStatus.Request();
 		req.status = initialText + input.toString();
 		req.language = preferences.postingDefaultLanguage;
 		req.visibility = preferences.postingDefaultVisibility;
 		req.inReplyToId = notification.status.id;
 		if(!notification.status.spoilerText.isEmpty() && GlobalUserPreferences.prefixRepliesWithRe && !notification.status.spoilerText.startsWith("re: ")){
 			req.spoilerText = "re: " + notification.status.spoilerText;
 		}
 		new CreateStatus(req, UUID.randomUUID().toString()).setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(Status status) {
 				NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 				Notification.Builder builder = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O ?
 						new Notification.Builder(context, accountID+"_"+notification.type) :
 						new Notification.Builder(context)
 								.setPriority(Notification.PRIORITY_DEFAULT)
 								.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
 				notification.status = status;
 				Intent contentIntent=new Intent(context, MainActivity.class);
 				contentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 				contentIntent.putExtra("fromNotification", true);
 				contentIntent.putExtra("accountID", accountID);
 				contentIntent.putExtra("notification", Parcels.wrap(notification));
 				Notification repliedNotification = builder.setSmallIcon(R.drawable.ic_ntf_logo)
 						.setContentTitle(context.getString(R.string.sk_notification_action_replied, notification.status.account.displayName))
 						.setContentText(status.getStrippedText())
 						.setCategory(Notification.CATEGORY_SOCIAL)
 						.setContentIntent(PendingIntent.getActivity(context, notificationId, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
 						.build();
 				notificationManager.notify(accountID, notificationId, repliedNotification);
 			}
 			@Override
 			public void onError(ErrorResponse errorResponse) {
 			}
 		}).exec(accountID);
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/ApiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/ApiUtils.java
@@ -11,7 +11,7 @@ public class ApiUtils{
 		//no instance
 	}
-	public static <E extends Enum<E>> List<String> enumSetToStrings(EnumSet<E> e, Class<E> cls){
+public static <E extends Enum<E>> List<String> enumSetToStrings(EnumSet<E> e, Class<E> cls){
 		return e.stream().map(ev->{
 			try{
 				SerializedName annotation=cls.getField(ev.name()).getAnnotation(SerializedName.class);
--- a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
@@ -13,11 +13,12 @@ import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.requests.notifications.GetNotifications;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
@@ -72,10 +73,8 @@ public class CacheController{
 								int flags=cursor.getInt(1);
 								status.hasGapAfter=((flags & POST_FLAG_GAP_AFTER)!=0);
 								newMaxID=status.id;
-								for(Filter filter:filters){
+								if (!new StatusFilterPredicate(filters, Filter.FilterContext.HOME).test(status))
-									if(filter.matches(status))
+									continue outer;
 										continue outer;
 								}
 								result.add(status);
 							}while(cursor.moveToNext());
 							String _newMaxID=newMaxID;
@@ -90,7 +89,7 @@ public class CacheController{
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Status> result){
-								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(new StatusFilterPredicate(filters)).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
+								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(new StatusFilterPredicate(filters, Filter.FilterContext.HOME)).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
 								putHomeTimeline(result, maxID==null);
 							}
@@ -126,11 +125,12 @@ public class CacheController{
 		});
 	}
-	public void getNotifications(String maxID, int count, boolean onlyMentions, boolean onlyPosts, boolean forceReload, Callback<PaginatedResponse<List<Notification>>> callback){
+	public void getNotifications(String maxID, int count, boolean onlyMentions, boolean onlyPosts, boolean forceReload, Callback<CacheablePaginatedResponse<List<Notification>>> callback){
 		cancelDelayedClose();
 		databaseThread.postRunnable(()->{
 			try{
-				List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.NOTIFICATIONS)).collect(Collectors.toList());
+				AccountSession accountSession=AccountSessionManager.getInstance().getAccount(accountID);
 				List<Filter> filters=accountSession.wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.NOTIFICATIONS)).collect(Collectors.toList());
 				if(!forceReload){
 					SQLiteDatabase db=getOrOpenDatabase();
 					String table=onlyPosts ? "notifications_posts" : onlyMentions ? "notifications_mentions" : "notifications_all";
@@ -145,35 +145,30 @@ public class CacheController{
 								ntf.postprocess();
 								newMaxID=ntf.id;
 								if(ntf.status!=null){
-									for(Filter filter:filters){
+									if (!new StatusFilterPredicate(filters, Filter.FilterContext.NOTIFICATIONS).test(ntf.status))
-										if(filter.matches(ntf.status))
+										continue outer;
 											continue outer;
 									}
 								}
 								result.add(ntf);
 							}while(cursor.moveToNext());
 							String _newMaxID=newMaxID;
-							uiHandler.post(()->callback.onSuccess(new PaginatedResponse<>(result, _newMaxID)));
+							uiHandler.post(()->callback.onSuccess(new CacheablePaginatedResponse<>(result, _newMaxID, true)));
 							return;
 						}
 					}catch(IOException x){
 						Log.w(TAG, "getNotifications: corrupted notification object in database", x);
 					}
 				}
-				new GetNotifications(maxID, count, onlyPosts ? EnumSet.of(Notification.Type.STATUS) : onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class))
+				Instance instance=AccountSessionManager.getInstance().getInstanceInfo(accountSession.domain);
 				new GetNotifications(maxID, count, onlyPosts ? EnumSet.of(Notification.Type.STATUS) : onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class), instance.isAkkoma())
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Notification> result){
-								callback.onSuccess(new PaginatedResponse<>(result.stream().filter(ntf->{
+								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(ntf->{
 									if(ntf.status!=null){
-										for(Filter filter:filters){
+										return new StatusFilterPredicate(filters, Filter.FilterContext.NOTIFICATIONS).test(ntf.status);
 											if(filter.matches(ntf.status)){
 												return false;
 											}
 										}
 									}
 									return true;
-								}).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id));
+								}).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
 								putNotifications(result, onlyMentions, onlyPosts, maxID==null);
 							}
--- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
@@ -16,6 +16,7 @@ import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.gson.IsoInstantTypeAdapter;
 import org.joinmastodon.android.api.gson.IsoLocalDateTypeAdapter;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.model.Status;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -27,6 +28,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -40,14 +42,19 @@ import okhttp3.ResponseBody;
 public class MastodonAPIController{
 	private static final String TAG="MastodonAPIController";
-	public static final Gson gson=new GsonBuilder()
+	public static final Gson gsonWithoutDeserializer = new GsonBuilder()
 			.disableHtmlEscaping()
 			.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
 			.registerTypeAdapter(Instant.class, new IsoInstantTypeAdapter())
 			.registerTypeAdapter(LocalDate.class, new IsoLocalDateTypeAdapter())
 			.create();
 	public static final Gson gson = gsonWithoutDeserializer.newBuilder()
 			.registerTypeAdapter(Status.class, new Status.StatusDeserializer())
 			.create();
 	private static WorkerThread thread=new WorkerThread("MastodonAPIController");
-	private static OkHttpClient httpClient=new OkHttpClient.Builder().build();
+	private static OkHttpClient httpClient=new OkHttpClient.Builder()
 			.readTimeout(5, TimeUnit.MINUTES)
 			.build();
 	private AccountSession session;
 	private static List<String> badDomains = new ArrayList<>();
@@ -56,7 +63,7 @@ public class MastodonAPIController{
 		thread.start();
 		try {
 			final BufferedReader reader = new BufferedReader(new InputStreamReader(
-					MastodonApp.context.getAssets().open("blocks.tsv")
+					MastodonApp.context.getAssets().open("blocks.txt")
 			));
 			String line;
 			while ((line = reader.readLine()) != null) {
@@ -87,7 +94,7 @@ public class MastodonAPIController{
 				Request.Builder builder=new Request.Builder()
 						.url(req.getURL().toString())
 						.method(req.getMethod(), req.getRequestBody())
-						.header("User-Agent", "MastodonAndroid/"+BuildConfig.VERSION_NAME);
+						.header("User-Agent", "MegalodonAndroid/"+BuildConfig.VERSION_NAME);
 				String token=null;
 				if(session!=null)
--- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonErrorResponse.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonErrorResponse.java
@@ -5,8 +5,6 @@ import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 import org.joinmastodon.android.R;
 import me.grishka.appkit.api.ErrorResponse;
 public class MastodonErrorResponse extends ErrorResponse{
@@ -22,7 +20,7 @@ public class MastodonErrorResponse extends ErrorResponse{
 	@Override
 	public void bindErrorView(View view){
-		TextView text=view.findViewById(R.id.error_text);
+		TextView text=view.findViewById(me.grishka.appkit.R.id.error_text);
 		text.setText(error);
 	}
--- a/mastodon/src/main/java/org/joinmastodon/android/api/StatusInteractionController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/StatusInteractionController.java
@@ -46,7 +46,7 @@ public class StatusInteractionController{
 					@Override
 					public void onSuccess(Status result){
 						runningFavoriteRequests.remove(status.id);
-						result.favouritesCount = Math.max(0, status.favouritesCount) + (favorited ? 1 : -1);
+						result.favouritesCount = Math.max(0, status.favouritesCount + (favorited ? 1 : -1));
 						cb.accept(result);
 						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
 					}
@@ -80,7 +80,7 @@ public class StatusInteractionController{
 					public void onSuccess(Status reblog){
 						Status result = reblog.getContentStatus();
 						runningReblogRequests.remove(status.id);
-						result.reblogsCount = Math.max(0, status.reblogsCount) + (reblogged ? 1 : -1);
+						result.reblogsCount = Math.max(0, status.reblogsCount + (reblogged ? 1 : -1));
 						cb.accept(result);
 						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
 					}
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/markers/GetMarkers.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/markers/GetMarkers.java
@@ -0,0 +1,17 @@
 package org.joinmastodon.android.api.requests.markers;
 import org.joinmastodon.android.api.ApiUtils;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Marker;
 import org.joinmastodon.android.model.Markers;
 import java.util.EnumSet;
 public class GetMarkers extends MastodonAPIRequest<Markers> {
 	public GetMarkers(EnumSet<Marker.Type> timelines) {
 		super(HttpMethod.GET, "/markers", Markers.class);
 		for (String type : ApiUtils.enumSetToStrings(timelines, Marker.Type.class)){
 			addQueryParameter("timeline[]", type);
 		}
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/GetNotifications.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/GetNotifications.java
@@ -1,6 +1,5 @@
 package org.joinmastodon.android.api.requests.notifications;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
 import org.joinmastodon.android.api.ApiUtils;
@@ -11,18 +10,24 @@ import java.util.EnumSet;
 import java.util.List;
 public class GetNotifications extends MastodonAPIRequest<List<Notification>>{
-	public GetNotifications(String maxID, int limit, EnumSet<Notification.Type> includeTypes){
+	public GetNotifications(String maxID, int limit, EnumSet<Notification.Type> includeTypes, boolean isPleromaInstance){
 		super(HttpMethod.GET, "/notifications", new TypeToken<>(){});
 		if(maxID!=null)
 			addQueryParameter("max_id", maxID);
 		if(limit>0)
 			addQueryParameter("limit", ""+limit);
 		if(includeTypes!=null){
-			for(String type:ApiUtils.enumSetToStrings(includeTypes, Notification.Type.class)){
+			if(!isPleromaInstance) {
-				addQueryParameter("types[]", type);
+				for(String type:ApiUtils.enumSetToStrings(includeTypes, Notification.Type.class)){
-			}
+					addQueryParameter("types[]", type);
-			for(String type:ApiUtils.enumSetToStrings(EnumSet.complementOf(includeTypes), Notification.Type.class)){
+				}
-				addQueryParameter("exclude_types[]", type);
+				for(String type:ApiUtils.enumSetToStrings(EnumSet.complementOf(includeTypes), Notification.Type.class)){
 					addQueryParameter("exclude_types[]", type);
 				}
 			}else{
 				for(String type:ApiUtils.enumSetToStrings(includeTypes, Notification.Type.class)){
 					addQueryParameter("include_types[]", type);
 				}
 			}
 		}
 		removeUnsupportedItems=true;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/PleromaMarkNotificationsRead.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/PleromaMarkNotificationsRead.java
@@ -0,0 +1,30 @@
 package org.joinmastodon.android.api.requests.notifications;
 import android.text.TextUtils;
 import com.google.gson.reflect.TypeToken;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Notification;
 import java.util.List;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 public class PleromaMarkNotificationsRead extends MastodonAPIRequest<List<Notification>> {
    private String maxID;
    public PleromaMarkNotificationsRead(String maxID) {
        super(HttpMethod.POST, "/pleroma/notifications/read", new TypeToken<>(){});
        this.maxID = maxID;
    }
    @Override
    public RequestBody getRequestBody() {
        MultipartBody.Builder builder=new MultipartBody.Builder()
                .setType(MultipartBody.FORM);
        if(!TextUtils.isEmpty(maxID))
            builder.addFormDataPart("max_id", maxID);
        return builder.build();
    }
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/CreateStatus.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/CreateStatus.java
@@ -1,6 +1,7 @@
 package org.joinmastodon.android.api.requests.statuses;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
@@ -45,6 +46,9 @@ public class CreateStatus extends MastodonAPIRequest<Status>{
 		public Instant scheduledAt;
 		public String language;
 		public String quoteId;
 		public ContentType contentType;
 		public static class Poll{
 			public ArrayList<String> options=new ArrayList<>();
 			public int expiresIn;
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusSourceText.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusSourceText.java
@@ -2,17 +2,22 @@ package org.joinmastodon.android.api.requests.statuses;
 import org.joinmastodon.android.api.AllFieldsAreRequired;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.RequiredField;
 import org.joinmastodon.android.model.BaseModel;
 import org.joinmastodon.android.model.ContentType;
 public class GetStatusSourceText extends MastodonAPIRequest<GetStatusSourceText.Response>{
 	public GetStatusSourceText(String id){
 		super(HttpMethod.GET, "/statuses/"+id+"/source", Response.class);
 	}
 	@AllFieldsAreRequired
 	public static class Response extends BaseModel{
 		@RequiredField
 		public String id;
 		@RequiredField
 		public String text;
 		@RequiredField
 		public String spoilerText;
 		public ContentType contentType;
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetBubbleTimeline.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetBubbleTimeline.java
@@ -0,0 +1,23 @@
 package org.joinmastodon.android.api.requests.timelines;
 import android.text.TextUtils;
 import com.google.gson.reflect.TypeToken;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
 import java.util.List;
 public class GetBubbleTimeline extends MastodonAPIRequest<List<Status>> {
    public GetBubbleTimeline(String maxID, int limit) {
        super(HttpMethod.GET, "/timelines/bubble", new TypeToken<>(){});
        if(!TextUtils.isEmpty(maxID))
            addQueryParameter("max_id", maxID);
        if(limit>0)
            addQueryParameter("limit", limit+"");
        if(GlobalUserPreferences.replyVisibility != null)
            addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
    }
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHashtagTimeline.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHashtagTimeline.java
@@ -2,6 +2,7 @@ package org.joinmastodon.android.api.requests.timelines;
 import com.google.gson.reflect.TypeToken;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
@@ -16,5 +17,7 @@ public class GetHashtagTimeline extends MastodonAPIRequest<List<Status>>{
 			addQueryParameter("min_id", minID);
 		if(limit>0)
 			addQueryParameter("limit", ""+limit);
 		if(GlobalUserPreferences.replyVisibility != null)
 			addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHomeTimeline.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHomeTimeline.java
@@ -2,6 +2,7 @@ package org.joinmastodon.android.api.requests.timelines;
 import com.google.gson.reflect.TypeToken;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
@@ -18,5 +19,7 @@ public class GetHomeTimeline extends MastodonAPIRequest<List<Status>>{
 			addQueryParameter("since_id", sinceID);
 		if(limit>0)
 			addQueryParameter("limit", ""+limit);
 		if(GlobalUserPreferences.replyVisibility != null)
 			addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetListTimeline.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetListTimeline.java
@@ -2,6 +2,7 @@ package org.joinmastodon.android.api.requests.timelines;
 import com.google.gson.reflect.TypeToken;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
@@ -18,5 +19,7 @@ public class GetListTimeline extends MastodonAPIRequest<List<Status>> {
            addQueryParameter("limit", ""+limit);
        if(sinceID!=null)
            addQueryParameter("since_id", sinceID);
        if(GlobalUserPreferences.replyVisibility != null)
            addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
    }
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java
@@ -4,6 +4,7 @@ import android.text.TextUtils;
 import com.google.gson.reflect.TypeToken;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
@@ -20,5 +21,7 @@ public class GetPublicTimeline extends MastodonAPIRequest<List<Status>>{
 			addQueryParameter("max_id", maxID);
 		if(limit>0)
 			addQueryParameter("limit", limit+"");
 		if(GlobalUserPreferences.replyVisibility != null)
 			addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
@@ -1,5 +1,7 @@
 package org.joinmastodon.android.api.session;
 import android.net.Uri;
 import org.joinmastodon.android.api.CacheController;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.PushSubscriptionManager;
@@ -7,12 +9,15 @@ import org.joinmastodon.android.api.StatusInteractionController;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Application;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Markers;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushSubscription;
 import org.joinmastodon.android.model.Token;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 public class AccountSession{
 	public Token token;
@@ -31,6 +36,7 @@ public class AccountSession{
 	public String pushAccountID;
 	public Preferences preferences;
 	public AccountActivationInfo activationInfo;
 	public Markers markers;
 	private transient MastodonAPIController apiController;
 	private transient StatusInteractionController statusInteractionController, remoteStatusInteractionController;
 	private transient CacheController cacheController;
@@ -85,4 +91,15 @@ public class AccountSession{
 			pushSubscriptionManager=new PushSubscriptionManager(getID());
 		return pushSubscriptionManager;
 	}
 	public Optional<Instance> getInstance() {
 		return Optional.ofNullable(AccountSessionManager.getInstance().getInstanceInfo(domain));
 	}
 	public Uri getInstanceUri() {
 		return new Uri.Builder()
 				.scheme("https")
 				.authority(getInstance().map(i -> i.normalizedUri).orElse(domain))
 				.build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
@@ -15,6 +15,7 @@ import android.util.Log;
 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
@@ -25,6 +26,7 @@ import org.joinmastodon.android.api.requests.accounts.GetWordFilters;
 import org.joinmastodon.android.api.requests.instance.GetCustomEmojis;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.joinmastodon.android.api.requests.markers.GetMarkers;
 import org.joinmastodon.android.api.requests.oauth.CreateOAuthApp;
 import org.joinmastodon.android.events.EmojiUpdatedEvent;
 import org.joinmastodon.android.model.Account;
@@ -33,6 +35,8 @@ import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.EmojiCategory;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Marker;
 import org.joinmastodon.android.model.Markers;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.Token;
@@ -46,6 +50,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -106,6 +111,12 @@ public class AccountSessionManager{
 		sessions.put(session.getID(), session);
 		lastActiveAccountID=session.getID();
 		writeAccountsFile();
 		// write initial instance info to file immediately to avoid sessions without instance info
 		InstanceInfoStorageWrapper wrapper = new InstanceInfoStorageWrapper();
 		wrapper.instance = instance;
 		MastodonAPIController.runInBackground(()->writeInstanceInfoFile(wrapper, instance.uri));
 		updateMoreInstanceInfo(instance, instance.uri);
 		if(PushSubscriptionManager.arePushNotificationsAvailable()){
 			session.getPushSubscriptionManager().registerAccountForPush(null);
@@ -114,14 +125,16 @@ public class AccountSessionManager{
 	}
 	public synchronized void writeAccountsFile(){
-		File file=new File(MastodonApp.context.getFilesDir(), "accounts.json");
+		File tmpFile = new File(MastodonApp.context.getFilesDir(), "accounts.json~");
 		File file = new File(MastodonApp.context.getFilesDir(), "accounts.json");
 		try{
-			try(FileOutputStream out=new FileOutputStream(file)){
+			try(FileOutputStream out=new FileOutputStream(tmpFile)){
 				SessionsStorageWrapper w=new SessionsStorageWrapper();
 				w.accounts=new ArrayList<>(sessions.values());
 				OutputStreamWriter writer=new OutputStreamWriter(out, StandardCharsets.UTF_8);
 				MastodonAPIController.gson.toJson(w, writer);
 				writer.flush();
 				if (!tmpFile.renameTo(file)) Log.e(TAG, "Error renaming " + tmpFile.getPath() + " to " + file.getPath());
 			}
 		}catch(IOException x){
 			Log.e(TAG, "Error writing accounts file", x);
@@ -174,6 +187,7 @@ public class AccountSessionManager{
 		AccountSession session=getAccount(id);
 		session.getCacheController().closeDatabase();
 		MastodonApp.context.deleteDatabase(id+".db");
 		GlobalUserPreferences.removeAccount(id);
 		sessions.remove(id);
 		if(lastActiveAccountID.equals(id)){
 			if(sessions.isEmpty())
@@ -244,30 +258,44 @@ public class AccountSessionManager{
 	}
 	public void maybeUpdateLocalInfo(){
 		maybeUpdateLocalInfo(null);
 	}
 	public void maybeUpdateLocalInfo(AccountSession activeSession){
 		long now=System.currentTimeMillis();
 		HashSet<String> domains=new HashSet<>();
 		for(AccountSession session:sessions.values()){
 			domains.add(session.domain.toLowerCase());
-//			if(now-session.infoLastUpdated>24L*3600_000L){
+			if(now-session.infoLastUpdated>24L*3600_000L || session == activeSession){
-			updateSessionPreferences(session);
+				updateSessionPreferences(session);
-			updateSessionLocalInfo(session);
+				updateSessionLocalInfo(session);
-//			}
+			}
-//			if(now-session.filtersLastUpdated>3600_000L){
+			if(now-session.filtersLastUpdated>3600_000L || session == activeSession){
-			updateSessionWordFilters(session);
+				updateSessionWordFilters(session);
-//			}
+			}
 			updateSessionMarkers(session);
 		}
 		if(loadedInstances){
-			maybeUpdateCustomEmojis(domains);
+			maybeUpdateCustomEmojis(domains, activeSession != null ? activeSession.domain : null);
 		}
 	}
-	private void maybeUpdateCustomEmojis(Set<String> domains){
+	private void maybeUpdateCustomEmojis(Set<String> domains, String activeDomain){
 		long now=System.currentTimeMillis();
 		for(String domain:domains){
-//			Long lastUpdated=instancesLastUpdated.get(domain);
+			Long lastUpdated=instancesLastUpdated.get(domain);
-//			if(lastUpdated==null || now-lastUpdated>24L*3600_000L){
+			if(lastUpdated==null || now-lastUpdated>24L*3600_000L || domain.equals(activeDomain)){
-			updateInstanceInfo(domain);
+				updateInstanceInfo(domain);
-//			}
+			}
 		}
 	}
 	private void preferencesFromSource(AccountSession session, Account account) {
 		if (account != null && account.source != null && session.preferences != null) {
 			if (account.source.privacy != null)
 				session.preferences.postingDefaultVisibility = account.source.privacy;
 			if (account.source.language != null)
 				session.preferences.postingDefaultLanguage = account.source.language;
 		}
 	}
@@ -278,13 +306,12 @@ public class AccountSessionManager{
 					public void onSuccess(Account result){
 						session.self=result;
 						session.infoLastUpdated=System.currentTimeMillis();
 						preferencesFromSource(session, result);
 						writeAccountsFile();
 					}
 					@Override
-					public void onError(ErrorResponse error){
+					public void onError(ErrorResponse error){}
 					}
 				})
 				.exec(session.getID());
 	}
@@ -294,10 +321,14 @@ public class AccountSessionManager{
 			@Override
 			public void onSuccess(Preferences preferences) {
 				session.preferences=preferences;
 				preferencesFromSource(session, session.self);
 			}
 			@Override
-			public void onError(ErrorResponse error) {}
+			public void onError(ErrorResponse error) {
 				session.preferences = new Preferences();
 				preferencesFromSource(session, session.self);
 			}
 		}).exec(session.getID());
 	}
@@ -319,6 +350,21 @@ public class AccountSessionManager{
 				.exec(session.getID());
 	}
 	private void updateSessionMarkers(AccountSession session) {
 		new GetMarkers(EnumSet.allOf(Marker.Type.class)).setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(Markers markers) {
 				session.markers = markers;
 				writeAccountsFile();
 			}
 			@Override
 			public void onError(ErrorResponse error) {
 			}
 		}).exec(session.getID());
 	}
 	public void updateInstanceInfo(String domain){
 		new GetInstance()
 				.setCallback(new Callback<>(){
@@ -368,7 +414,9 @@ public class AccountSessionManager{
 					@Override
 					public void onError(ErrorResponse error){
-
+						InstanceInfoStorageWrapper wrapper=new InstanceInfoStorageWrapper();
 						wrapper.instance = instance;
 						MastodonAPIController.runInBackground(()->writeInstanceInfoFile(wrapper, domain));
 					}
 				})
 				.execNoAuth(domain);
@@ -379,10 +427,13 @@ public class AccountSessionManager{
 	}
 	private void writeInstanceInfoFile(InstanceInfoStorageWrapper emojis, String domain){
-		try(FileOutputStream out=new FileOutputStream(getInstanceInfoFile(domain))){
+		File file = getInstanceInfoFile(domain);
 		File tmpFile = new File(file.getPath() + "~");
 		try(FileOutputStream out=new FileOutputStream(tmpFile)){
 			OutputStreamWriter writer=new OutputStreamWriter(out, StandardCharsets.UTF_8);
 			MastodonAPIController.gson.toJson(emojis, writer);
 			writer.flush();
 			if (!tmpFile.renameTo(file)) Log.e(TAG, "Error renaming " + tmpFile.getPath() + " to " + file.getPath());
 		}catch(IOException x){
 			Log.w(TAG, "Error writing instance info file for "+domain, x);
 		}
@@ -402,7 +453,7 @@ public class AccountSessionManager{
 		}
 		if(!loadedInstances){
 			loadedInstances=true;
-			maybeUpdateCustomEmojis(domains);
+			maybeUpdateCustomEmojis(domains, null);
 		}
 	}
@@ -426,10 +477,6 @@ public class AccountSessionManager{
 		return instances.get(domain);
 	}
 	public Instance getInstanceInfoForAccount(String account) {
 		return AccountSessionManager.getInstance().getInstanceInfo(instance.getAccount(account).domain);
 	}
 	public void updateAccountInfo(String id, Account account){
 		AccountSession session=getAccount(id);
 		session.self=account;
--- a/mastodon/src/main/java/org/joinmastodon/android/events/AllNotificationsSeenEvent.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/events/AllNotificationsSeenEvent.java
@@ -0,0 +1,4 @@
 package org.joinmastodon.android.events;
 public class AllNotificationsSeenEvent {
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/events/NotificationReceivedEvent.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/events/NotificationReceivedEvent.java
@@ -0,0 +1,9 @@
 package org.joinmastodon.android.events;
 public class NotificationReceivedEvent {
 	public String account, id;
 	public NotificationReceivedEvent(String account, String id) {
 		this.account = account;
 		this.id = id;
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java
@@ -1,12 +1,9 @@
 package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.view.animation.TranslateAnimation;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
@@ -64,7 +61,12 @@ public class AccountTimelineFragment extends StatusListFragment{
 					@Override
 					public void onSuccess(List<Status> result){
 						if(getActivity()==null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.ACCOUNT)).collect(Collectors.toList());
+						AccountSessionManager asm = AccountSessionManager.getInstance();
 						result=result.stream().filter(status -> {
 							// don't hide own posts in own profile
 							if (asm.isSelf(accountID, user) && asm.isSelf(accountID, status.account)) return true;
 							else return new StatusFilterPredicate(accountID, getFilterContext()).test(status);
 						}).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -84,7 +86,8 @@ public class AccountTimelineFragment extends StatusListFragment{
 	}
 	protected void onStatusCreated(StatusCreatedEvent ev){
-		if(!AccountSessionManager.getInstance().isSelf(accountID, ev.status.account))
+		AccountSessionManager asm = AccountSessionManager.getInstance();
 		if(!asm.isSelf(accountID, ev.status.account) || !asm.isSelf(accountID, user))
 			return;
 		if(filter==GetAccountStatuses.Filter.PINNED) return;
 		if(filter==GetAccountStatuses.Filter.DEFAULT){
@@ -122,4 +125,19 @@ public class AccountTimelineFragment extends StatusListFragment{
 	protected void onRemoveAccountPostsEvent(RemoveAccountPostsEvent ev){
 		// no-op
 	}
 	@Override
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.ACCOUNT;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		// could return different uris based on filter (e.g. media -> "/media"), but i want to
 		// return the remote url to the user, and i don't know whether i'd need to append
 		// '#media' (akkoma/pleroma) or '/media' (glitch/mastodon) since i don't know anything
 		// about the remote instance. so, just returning the base url to the user instead
 		return Uri.parse(user.url);
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
@@ -3,6 +3,7 @@ package org.joinmastodon.android.fragments;
 import static java.util.stream.Collectors.toList;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -103,4 +104,9 @@ public class AnnouncementsFragment extends BaseStatusListFragment<Announcement>
 				})
 				.exec(accountID);
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return isInstanceAkkoma() ? base.path("/announcements").build() : null;
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.app.assist.AssistContent;
 import android.content.res.Configuration;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -13,13 +14,11 @@ import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.view.animation.TranslateAnimation;
 import android.widget.ImageButton;
 import android.widget.ImageButton;
 import android.widget.Toolbar;
 import org.joinmastodon.android.E;
@@ -34,12 +33,11 @@ import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.TileGridLayoutManager;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.ImageStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.MediaGridStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.PollFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.PollOptionStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
@@ -47,8 +45,10 @@ import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.WarningFilteredStatusDisplayItem;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewerHost;
 import org.joinmastodon.android.ui.utils.MediaAttachmentViewController;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.ui.views.ImageAttachmentFrameLayout;
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.joinmastodon.android.utils.TypedObjectPool;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -59,13 +59,11 @@ import java.util.stream.Collectors;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -73,7 +71,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
-public abstract class BaseStatusListFragment<T extends DisplayItemsParent> extends BaseRecyclerFragment<T> implements PhotoViewerHost, ScrollableToTop{
+public abstract class BaseStatusListFragment<T extends DisplayItemsParent> extends RecyclerFragment<T> implements PhotoViewerHost, ScrollableToTop, HasFab, ProvidesAssistContent.ProvidesWebUri {
 	protected ArrayList<StatusDisplayItem> displayItems=new ArrayList<>();
 	protected DisplayItemsAdapter adapter;
 	protected String accountID;
@@ -83,13 +81,15 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	protected HashMap<String, Account> knownAccounts=new HashMap<>();
 	protected HashMap<String, Relationship> relationships=new HashMap<>();
 	protected Rect tmpRect=new Rect();
 	protected TypedObjectPool<MediaGridStatusDisplayItem.GridItemType, MediaAttachmentViewController> attachmentViewsPool=new TypedObjectPool<>(this::makeNewMediaAttachmentView);
 	protected boolean currentlyScrolling;
 	public BaseStatusListFragment(){
 		super(20);
-		if (withComposeButton()) setListLayoutId(R.layout.recycler_fragment_with_fab);
+		if (wantsComposeButton()) setListLayoutId(R.layout.recycler_fragment_with_fab);
 	}
-	protected boolean withComposeButton() {
+	protected boolean wantsComposeButton() {
 		return false;
 	}
@@ -104,8 +104,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			setRetainInstance(true);
 	}
 	@Override
 	protected RecyclerView.Adapter getAdapter(){
 		return adapter=new DisplayItemsAdapter();
@@ -134,7 +132,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		displayItems.clear();
 	}
-	protected void prependItems(List<T> items, boolean notify){
+	protected int prependItems(List<T> items, boolean notify){
 		data.addAll(0, items);
 		int offset=0;
 		for(T s:items){
@@ -147,6 +145,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		}
 		if(notify)
 			adapter.notifyItemRangeInserted(0, offset);
 		return offset;
 	}
 	protected String getMaxID(){
@@ -192,29 +191,30 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	}
 	@Override
-	public void openPhotoViewer(String parentID, Status _status, int attachmentIndex){
+	public void openPhotoViewer(String parentID, Status _status, int attachmentIndex, MediaGridStatusDisplayItem.Holder gridHolder){
-		final Status status=_status.reblog!=null ? _status.reblog : _status;
+		final Status status=_status.getContentStatus();
 		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, new PhotoViewer.Listener(){
-			private ImageStatusDisplayItem.Holder<?> transitioningHolder;
+			private MediaAttachmentViewController transitioningHolder;
 			@Override
 			public void setPhotoViewVisibility(int index, boolean visible){
-				ImageStatusDisplayItem.Holder<?> holder=findPhotoViewHolder(index);
+				MediaAttachmentViewController holder=findPhotoViewHolder(index);
 				if(holder!=null)
 					holder.photo.setAlpha(visible ? 1f : 0f);
 			}
 			@Override
 			public boolean startPhotoViewTransition(int index, @NonNull Rect outRect, @NonNull int[] outCornerRadius){
-				ImageStatusDisplayItem.Holder<?> holder=findPhotoViewHolder(index);
+				MediaAttachmentViewController holder=findPhotoViewHolder(index);
-				if(holder!=null){
+				if(holder!=null && list!=null){
 					transitioningHolder=holder;
 					View view=transitioningHolder.photo;
 					int[] pos={0, 0};
 					view.getLocationOnScreen(pos);
 					outRect.set(pos[0], pos[1], pos[0]+view.getWidth(), pos[1]+view.getHeight());
 					list.setClipChildren(false);
-					transitioningHolder.itemView.setElevation(1f);
+					gridHolder.setClipChildren(false);
 					transitioningHolder.view.setElevation(1f);
 					return true;
 				}
 				return false;
@@ -241,15 +241,16 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				view.setTranslationY(0f);
 				view.setScaleX(1f);
 				view.setScaleY(1f);
-				transitioningHolder.itemView.setElevation(0f);
+				transitioningHolder.view.setElevation(0f);
 				if(list!=null)
 					list.setClipChildren(true);
 				gridHolder.setClipChildren(true);
 				transitioningHolder=null;
 			}
 			@Override
 			public Drawable getPhotoViewCurrentDrawable(int index){
-				ImageStatusDisplayItem.Holder<?> holder=findPhotoViewHolder(index);
+				MediaAttachmentViewController holder=findPhotoViewHolder(index);
 				if(holder!=null)
 					return holder.photo.getDrawable();
 				return null;
@@ -265,60 +266,69 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				requestPermissions(permissions, PhotoViewer.PERMISSION_REQUEST);
 			}
-			private ImageStatusDisplayItem.Holder<?> findPhotoViewHolder(int index){
+			private MediaAttachmentViewController findPhotoViewHolder(int index){
-				if(list==null)
+				return gridHolder.getViewController(index);
 					return null;
 				int offset=0;
 				for(StatusDisplayItem item:displayItems){
 					if(item.parentID.equals(parentID)){
 						if(item instanceof ImageStatusDisplayItem){
 							RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(getMainAdapterOffset()+offset+index);
 							if(holder instanceof ImageStatusDisplayItem.Holder<?> imgHolder){
 								return imgHolder;
 							}
 							return null;
 						}
 					}
 					offset++;
 				}
 				return null;
 			}
 		});
 	}
 	@Override
 	public @Nullable View getFab() {
 		if (getParentFragment() instanceof HasFab l) return l.getFab();
 		else return fab;
 	}
 	@Override
 	public void showFab() {
 		View fab = getFab();
 		if (fab == null || fab.getVisibility() == View.VISIBLE) return;
 		fab.setVisibility(View.VISIBLE);
 		TranslateAnimation animate = new TranslateAnimation(
 				0,
 				0,
 				fab.getHeight() * 2,
 				0);
 		animate.setDuration(300);
 		fab.startAnimation(animate);
 	}
 	public boolean isScrolling() {
 		return currentlyScrolling;
 	}
 	@Override
 	public void hideFab() {
 		View fab = getFab();
 		if (fab == null || fab.getVisibility() != View.VISIBLE) return;
 		TranslateAnimation animate = new TranslateAnimation(
 				0,
 				0,
 				0,
 				fab.getHeight() * 2);
 		animate.setDuration(300);
 		fab.startAnimation(animate);
 		fab.setVisibility(View.INVISIBLE);
 		scrollDiff = 0;
 	}
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
 		fab=view.findViewById(R.id.fab);
 		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
 			@Override
 			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
 				if(currentPhotoViewer!=null)
 					currentPhotoViewer.offsetView(-dx, -dy);
-				if (fab!=null && GlobalUserPreferences.autoHideFab) {
+				View fab = getFab();
 				if (fab!=null && GlobalUserPreferences.autoHideFab && dy != UiUtils.SCROLL_TO_TOP_DELTA) {
 					if (dy > 0 && fab.getVisibility() == View.VISIBLE) {
-						TranslateAnimation animate = new TranslateAnimation(
+						hideFab();
 								0,
 								0,
 								0,
 								fab.getHeight() * 2);
 						animate.setDuration(300);
 						animate.setFillAfter(true);
 						fab.startAnimation(animate);
 						fab.setVisibility(View.INVISIBLE);
 						scrollDiff = 0;
 					} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
-						if (list.getChildLayoutPosition(list.getChildAt(0)) == 0 || scrollDiff > 400) {
+						if (list.getChildAt(0).getTop() == 0 || scrollDiff > 400) {
-							fab.setVisibility(View.VISIBLE);
+							showFab();
 							TranslateAnimation animate = new TranslateAnimation(
 									0,
 									0,
 									fab.getHeight() * 2,
 									0);
 							animate.setDuration(300);
 							animate.setFillAfter(true);
 							fab.startAnimation(animate);
 							scrollDiff = 0;
 						} else {
 							scrollDiff += Math.abs(dy);
@@ -326,12 +336,20 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 					}
 				}
 			}
 			@Override
 			public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
 				super.onScrollStateChanged(recyclerView, newState);
 				currentlyScrolling = newState != RecyclerView.SCROLL_STATE_IDLE;
 			}
 		});
 		list.addItemDecoration(new StatusListItemDecoration());
 		((UsableRecyclerView)list).setSelectorBoundsProvider(new UsableRecyclerView.SelectorBoundsProvider(){
 			private Rect tmpRect=new Rect();
 			@Override
 			public void getSelectorBounds(View view, Rect outRect){
 				boolean hasDescendant = false, hasAncestor = false, isWarning = false;
 				int lastIndex = -1, firstIndex = -1;
 				list.getDecoratedBoundsWithMargins(view, outRect);
 				RecyclerView.ViewHolder holder=list.getChildViewHolder(view);
 				if(holder instanceof StatusDisplayItem.Holder){
@@ -343,56 +361,57 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 					for(int i=0;i<list.getChildCount();i++){
 						View child=list.getChildAt(i);
 						holder=list.getChildViewHolder(child);
-						if(holder instanceof StatusDisplayItem.Holder){
+						if(holder instanceof StatusDisplayItem.Holder<?> h){
 							String otherID=((StatusDisplayItem.Holder<?>) holder).getItemID();
 							if(otherID.equals(id)){
 								if (firstIndex < 0) firstIndex = i;
 								lastIndex = i;
 								StatusDisplayItem item = h.getItem();
 								hasDescendant = item.hasDescendantNeighbor;
 								// no for direct descendants because main status (right above) is
 								// being displayed with an extended footer - no connected layout
 								hasAncestor = item.hasAncestoringNeighbor && !item.isDirectDescendant;
 								list.getDecoratedBoundsWithMargins(child, tmpRect);
 								outRect.left=Math.min(outRect.left, tmpRect.left);
 								outRect.top=Math.min(outRect.top, tmpRect.top);
 								outRect.right=Math.max(outRect.right, tmpRect.right);
 								outRect.bottom=Math.max(outRect.bottom, tmpRect.bottom);
 								if (holder instanceof WarningFilteredStatusDisplayItem.Holder) {
 									isWarning = true;
 								}
 							}
 						}
 					}
 				}
 				// shifting the selection box down
 				// see also: FooterStatusDisplayItem#onBind (setMargins)
 				if (isWarning || firstIndex < 0 || lastIndex < 0 ||
 						!(list.getChildViewHolder(list.getChildAt(lastIndex))
 						instanceof FooterStatusDisplayItem.Holder)) return;
 				int prevIndex = firstIndex - 1, nextIndex = lastIndex + 1;
 				boolean prevIsWarning = prevIndex > 0 && prevIndex < list.getChildCount() &&
 						list.getChildViewHolder(list.getChildAt(prevIndex))
 						instanceof WarningFilteredStatusDisplayItem.Holder;
 				boolean nextIsWarning = nextIndex > 0 && nextIndex < list.getChildCount() &&
 						list.getChildViewHolder(list.getChildAt(nextIndex))
 						instanceof WarningFilteredStatusDisplayItem.Holder;
 				if (!prevIsWarning && hasAncestor) outRect.top += V.dp(4);
 				if (!nextIsWarning && hasDescendant) outRect.bottom += V.dp(4);
 			}
 		});
 		list.setItemAnimator(new BetterItemAnimator());
 		((UsableRecyclerView) list).setIncludeMarginsInItemHitbox(true);
 		updateToolbar();
-		if (withComposeButton()) {
+		if (wantsComposeButton() && !getArguments().getBoolean("__disable_fab", false)) {
 			fab.setVisibility(View.VISIBLE);
 			fab.setOnClickListener(this::onFabClick);
 			fab.setOnLongClickListener(this::onFabLongClick);
 		} else if (fab != null) {
 			fab.setVisibility(View.GONE);
 		}
 	}
 	@Override
 	protected RecyclerView.LayoutManager onCreateLayoutManager(){
 		GridLayoutManager lm=new TileGridLayoutManager(getActivity(), 1000);
 		lm.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup(){
 			@Override
 			public int getSpanSize(int position){
 				position-=getMainAdapterOffset();
 				if(position>=0 && position<displayItems.size()){
 					StatusDisplayItem item=displayItems.get(position);
 					if(item instanceof ImageStatusDisplayItem imgItem){
 						PhotoLayoutHelper.TiledLayoutResult layout=imgItem.tiledLayout;
 						PhotoLayoutHelper.TiledLayoutResult.Tile tile=imgItem.thisTile;
 						int spans=0;
 						for(int i=0;i<tile.colSpan;i++){
 							spans+=layout.columnSizes[tile.startCol+i];
 						}
 						return spans;
 					}
 				}
 				return 1000;
 			}
 		});
 		return lm;
 	}
 	@Override
 	public void onConfigurationChanged(Configuration newConfig){
 		super.onConfigurationChanged(newConfig);
@@ -511,7 +530,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		revealSpoiler(status, holder.getItemID());
 	}
-	public void onRevealSpoilerClick(ImageStatusDisplayItem.Holder<?> holder){
+	public void onRevealSpoilerClick(MediaGridStatusDisplayItem.Holder holder){
 		Status status=holder.getItem().status;
 		revealSpoiler(status, holder.getItemID());
 	}
@@ -545,7 +564,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			holder.getItem().status.textExpandable = expandable;
 			HeaderStatusDisplayItem.Holder header = findHolderOfType(holder.getItemID(), HeaderStatusDisplayItem.Holder.class);
 			if (header != null) header.rebind();
 			holder.rebind();
 		}
 	}
@@ -559,19 +577,28 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	protected void updateImagesSpoilerState(Status status, String itemID){
 		ArrayList<Integer> updatedPositions=new ArrayList<>();
-		for(ImageStatusDisplayItem.Holder photo:(List<ImageStatusDisplayItem.Holder>)findAllHoldersOfType(itemID, ImageStatusDisplayItem.Holder.class)){
+		MediaGridStatusDisplayItem.Holder mediaGrid=findHolderOfType(itemID, MediaGridStatusDisplayItem.Holder.class);
-			photo.setRevealed(status.spoilerRevealed);
+		if(mediaGrid!=null){
-			updatedPositions.add(photo.getAbsoluteAdapterPosition()-getMainAdapterOffset());
+			mediaGrid.setRevealed(status.spoilerRevealed);
 			updatedPositions.add(mediaGrid.getAbsoluteAdapterPosition()-getMainAdapterOffset());
 		}
 		int i=0;
 		for(StatusDisplayItem item:displayItems){
-			if(itemID.equals(item.parentID) && item instanceof ImageStatusDisplayItem && !updatedPositions.contains(i)){
+			if(itemID.equals(item.parentID) && item instanceof MediaGridStatusDisplayItem && !updatedPositions.contains(i)){
 				adapter.notifyItemChanged(i);
 			}
 			i++;
 		}
 	}
 	public void onImageUpdated(MediaGridStatusDisplayItem.Holder holder, int index) {
 		holder.rebind();
 		MediaGridStatusDisplayItem.Holder mediaGrid = findHolderOfType(holder.getItemID(), MediaGridStatusDisplayItem.Holder.class);
 		if(mediaGrid!=null){
 			adapter.notifyItemChanged(mediaGrid.getAbsoluteAdapterPosition());
 		}
 	}
 	public void onGapClick(GapStatusDisplayItem.Holder item){}
 	public void onWarningClick(WarningFilteredStatusDisplayItem.Holder warning){
@@ -583,6 +610,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		warning.getItem().status.filterRevealed = true;
 	}
 	@Override
 	public String getAccountID(){
 		return accountID;
 	}
@@ -698,16 +726,29 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			currentPhotoViewer.onPause();
 	}
-	protected void onFabClick(View v){
+	public void onFabClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		Nav.go(getActivity(), ComposeFragment.class, args);
 	}
-	protected boolean onFabLongClick(View v) {
+	public boolean onFabLongClick(View v) {
 		return UiUtils.pickAccountForCompose(getActivity(), accountID);
 	}
 	private MediaAttachmentViewController makeNewMediaAttachmentView(MediaGridStatusDisplayItem.GridItemType type){
 		return new MediaAttachmentViewController(getActivity(), type);
 	}
 	public TypedObjectPool<MediaGridStatusDisplayItem.GridItemType, MediaAttachmentViewController> getAttachmentViewsPool(){
 		return attachmentViewsPool;
 	}
 	@Override
 	public void onProvideAssistContent(AssistContent assistContent) {
 		assistContent.setWebUri(getWebUri(getSession().getInstanceUri().buildUpon()));
 	}
 	protected class DisplayItemsAdapter extends UsableRecyclerView.Adapter<BindableViewHolder<StatusDisplayItem>> implements ImageLoaderRecyclerAdapter{
 		public DisplayItemsAdapter(){
@@ -745,16 +786,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		public ImageLoaderRequest getImageRequest(int position, int image){
 			return displayItems.get(position).getImageRequest(image);
 		}
 //		@Override
 //		public void onViewDetachedFromWindow(@NonNull BindableViewHolder<StatusDisplayItem> holder){
 //			if(holder instanceof ImageLoaderViewHolder){
 //				int count=holder.getItem().getImageCount();
 //				for(int i=0;i<count;i++){
 //					((ImageLoaderViewHolder) holder).clearImage(i);
 //				}
 //			}
 //		}
 	}
 	private class StatusListItemDecoration extends RecyclerView.ItemDecoration{
@@ -778,6 +809,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				RecyclerView.ViewHolder siblingHolder=parent.getChildViewHolder(bottomSibling);
 				if(holder instanceof StatusDisplayItem.Holder<?> ih && siblingHolder instanceof StatusDisplayItem.Holder<?> sh
 						&& (!ih.getItemID().equals(sh.getItemID()) || sh instanceof ExtendedFooterStatusDisplayItem.Holder) && ih.getItem().getType()!=StatusDisplayItem.Type.GAP){
 					if (!ih.getItem().isMainStatus && ih.getItem().hasDescendantNeighbor) continue;
 					drawDivider(child, bottomSibling, holder, siblingHolder, parent, c, dividerPaint);
 				}
 			}
@@ -788,25 +820,21 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			for(int i=0;i<parent.getChildCount();i++){
 				View child=parent.getChildAt(i);
 				RecyclerView.ViewHolder holder=parent.getChildViewHolder(child);
-				if(holder instanceof ImageStatusDisplayItem.Holder<?> imgHolder){
+				if(holder instanceof MediaGridStatusDisplayItem.Holder imgHolder){
 					if(!imgHolder.getItem().status.spoilerRevealed && TextUtils.isEmpty(imgHolder.getItem().status.spoilerText)){
 						hiddenMediaPaint.setColor(0x80000000);
-						PhotoLayoutHelper.TiledLayoutResult.Tile tile=imgHolder.getItem().thisTile;
+						c.drawRect(child.getX(), child.getY(), child.getX()+child.getWidth(), child.getY()+child.getHeight(), hiddenMediaPaint);
 						float hGap=tile.startCol>0 ? V.dp(1) : 0;
 						float vGap=tile.startRow>0 ? V.dp(1) : 0;
 						c.drawRect(child.getX()-hGap, child.getY()-vGap, child.getX()+child.getWidth(), child.getY()+child.getHeight(), hiddenMediaPaint);
 					}
 				}
 			}
 			for(int i=0;i<parent.getChildCount();i++){
 				View child=parent.getChildAt(i);
 				RecyclerView.ViewHolder holder=parent.getChildViewHolder(child);
-				if(holder instanceof ImageStatusDisplayItem.Holder<?> imgHolder){
+				if(holder instanceof MediaGridStatusDisplayItem.Holder imgHolder){
 					if(!imgHolder.getItem().status.spoilerRevealed){
-						PhotoLayoutHelper.TiledLayoutResult.Tile tile=imgHolder.getItem().thisTile;
+						if(TextUtils.isEmpty(imgHolder.getItem().status.spoilerText)){
 						if(tile.startCol==0 && tile.startRow==0 && TextUtils.isEmpty(imgHolder.getItem().status.spoilerText)){
 							int listWidth=getListWidthForMediaLayout();
-							int width=Math.min(listWidth, V.dp(ImageAttachmentFrameLayout.MAX_WIDTH));
+							int width=Math.min(listWidth, UiUtils.MAX_WIDTH);
 							if(currentMediaHiddenLayoutsWidth!=width)
 								rebuildMediaHiddenLayouts(width-V.dp(32));
 							c.save();
@@ -831,47 +859,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			}
 		}
 		@Override
 		public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
 			RecyclerView.ViewHolder holder=parent.getChildViewHolder(view);
 			if(holder instanceof ImageStatusDisplayItem.Holder){
 				int listWidth=getListWidthForMediaLayout();
 				int width=Math.min(listWidth, V.dp(ImageAttachmentFrameLayout.MAX_WIDTH));
 				PhotoLayoutHelper.TiledLayoutResult layout=((ImageStatusDisplayItem.Holder<?>) holder).getItem().tiledLayout;
 				PhotoLayoutHelper.TiledLayoutResult.Tile tile=((ImageStatusDisplayItem.Holder<?>) holder).getItem().thisTile;
 				if(tile.startCol+tile.colSpan<layout.columnSizes.length){
 					outRect.right=V.dp(1);
 				}
 				if(tile.startRow+tile.rowSpan<layout.rowSizes.length){
 					outRect.bottom=V.dp(1);
 				}
 				// For a view that spans rows, compensate its additional height so the row it's in stays the right height
 				if(tile.rowSpan>1){
 					outRect.bottom=-(Math.round(tile.height/1000f*width)-Math.round(layout.rowSizes[tile.startRow]/1000f*width));
 				}
 				// ...and for its siblings, offset those on rows below first to the right where they belong
 				if(tile.startCol>0 && layout.tiles[0].rowSpan>1 && tile.startRow>layout.tiles[0].startRow){
 					int xOffset=Math.round(layout.tiles[0].width/1000f*listWidth);
 					outRect.left=xOffset;
 					outRect.right=-xOffset;
 				}
 				// If the width of the media block is smaller than that of the RecyclerView, offset the views horizontally to center them
 				if(listWidth>width){
 					outRect.left+=(listWidth-V.dp(ImageAttachmentFrameLayout.MAX_WIDTH))/2;
 					if(tile.startCol>0){
 						int spanOffset=0;
 						for(int i=0;i<tile.startCol;i++){
 							spanOffset+=layout.columnSizes[i];
 						}
 						outRect.left-=Math.round(spanOffset/1000f*listWidth);
 						outRect.left+=Math.round(spanOffset/1000f*width);
 					}
 				}
 			}
 		}
 		private void rebuildMediaHiddenLayouts(int width){
 			currentMediaHiddenLayoutsWidth=width;
 			String title=getString(R.string.sensitive_content);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BookmarkedStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BookmarkedStatusListFragment.java
@@ -1,9 +1,11 @@
 package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.net.Uri;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetBookmarkedStatuses;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Status;
@@ -35,4 +37,14 @@ public class BookmarkedStatusListFragment extends StatusListFragment{
 				})
 				.exec(accountID);
 	}
 	@Override
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.ACCOUNT;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return base.path("/bookmarks").build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -91,6 +91,7 @@ import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.EmojiCategory;
 import org.joinmastodon.android.model.Instance;
@@ -109,7 +110,7 @@ import org.joinmastodon.android.ui.text.ComposeAutocompleteSpan;
 import org.joinmastodon.android.ui.text.ComposeHashtagOrMentionSpan;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
-import org.joinmastodon.android.ui.utils.TransferSpeedTracker;
+import org.joinmastodon.android.utils.TransferSpeedTracker;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ComposeEditText;
 import org.joinmastodon.android.ui.views.ComposeMediaLayout;
@@ -179,8 +180,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private int charCount, charLimit, trimmedCharCount;
 	private Button publishButton, languageButton, scheduleTimeBtn, draftsBtn;
-	private PopupMenu languagePopup, visibilityPopup, draftOptionsPopup;
+	private PopupMenu languagePopup, contentTypePopup, visibilityPopup, draftOptionsPopup;
-	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn, scheduleDraftDismiss;
+	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn, scheduleDraftDismiss, contentTypeBtn;
 	private ImageView sensitiveIcon;
 	private ComposeMediaLayout attachmentsView;
 	private TextView replyText;
@@ -204,6 +205,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private List<EmojiCategory> customEmojis;
 	private CustomEmojiPopupKeyboard emojiKeyboard;
 	private Status replyTo;
 	private Status quote;
 	private String initialText;
 	private String uuid;
 	private int pollDuration=24*3600;
@@ -233,6 +235,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private Runnable updateUploadEtaRunnable;
 	private String language, encoding;
 	private ContentType contentType;
 	private MastodonLanguage.LanguageResolver languageResolver;
 	@Override
@@ -241,6 +244,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		setRetainInstance(true);
 		accountID=getArguments().getString("account");
 		contentType = GlobalUserPreferences.accountsDefaultContentTypes.get(accountID);
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
 		self=session.self;
 		instanceDomain=session.domain;
@@ -252,13 +257,12 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			editingStatus=Parcels.unwrap(getArguments().getParcelable("editStatus"));
 		if(getArguments().containsKey("replyTo"))
 			replyTo=Parcels.unwrap(getArguments().getParcelable("replyTo"));
 		if(getArguments().containsKey("quote"))
 			quote=Parcels.unwrap(getArguments().getParcelable("quote"));
 		if(instance==null){
 			Nav.finish(this);
 			return;
 		}
 		if(customEmojis.isEmpty()){
 			AccountSessionManager.getInstance().updateInstanceInfo(instanceDomain);
 		}
 		Bundle bundle = savedInstanceState != null ? savedInstanceState : getArguments();
 		if (bundle.containsKey("scheduledStatus")) scheduledStatus=Parcels.unwrap(bundle.getParcelable("scheduledStatus"));
@@ -327,13 +331,16 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		emojiBtn=view.findViewById(R.id.btn_emoji);
 		spoilerBtn=view.findViewById(R.id.btn_spoiler);
 		visibilityBtn=view.findViewById(R.id.btn_visibility);
 		contentTypeBtn=view.findViewById(R.id.btn_content_type);
 		scheduleDraftView=view.findViewById(R.id.schedule_draft_view);
 		scheduleDraftText=view.findViewById(R.id.schedule_draft_text);
 		scheduleDraftDismiss=view.findViewById(R.id.schedule_draft_dismiss);
 		scheduleTimeBtn=view.findViewById(R.id.scheduled_time_btn);
 		sensitiveIcon=view.findViewById(R.id.sensitive_icon);
 		sensitiveItem=view.findViewById(R.id.sensitive_item);
-		replyText=view.findViewById(R.id.reply_text);
+		replyText=view.findViewById(GlobalUserPreferences.replyLineAboveHeader ? R.id.reply_text : R.id.reply_text_below);
 		view.findViewById(GlobalUserPreferences.replyLineAboveHeader ? R.id.reply_text_below : R.id.reply_text)
 				.setVisibility(View.GONE);
 		if (isPhotoPickerAvailable()) {
 			PopupMenu attachPopup = new PopupMenu(getContext(), mediaBtn);
@@ -359,6 +366,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		visibilityBtn.setOnClickListener(v->visibilityPopup.show());
 		visibilityBtn.setOnTouchListener(visibilityPopup.getDragToOpenListener());
 		buildContentTypePopup(contentTypeBtn);
 		contentTypeBtn.setOnClickListener(v->contentTypePopup.show());
 		contentTypeBtn.setOnTouchListener(contentTypePopup.getDragToOpenListener());
 		scheduleDraftDismiss.setOnClickListener(v->updateScheduledAt(null));
 		scheduleTimeBtn.setOnClickListener(v->pickScheduledDateTime());
@@ -461,8 +472,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			}
 		}
-		if(editingStatus!=null && editingStatus.visibility!=null) {
+		if (savedInstanceState != null) {
-			statusVisibility=editingStatus.visibility;
+			statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
 		} else if (editingStatus != null && editingStatus.visibility != null) {
 			statusVisibility = editingStatus.visibility;
 		} else {
 			loadDefaultStatusVisibility(savedInstanceState);
 		}
@@ -477,6 +490,20 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		}).setChecked(true);
 		visibilityPopup.getMenu().findItem(R.id.local_only).setChecked(localOnly);
 		if (savedInstanceState != null && savedInstanceState.containsKey("contentType")) {
 			contentType = (ContentType) savedInstanceState.getSerializable("contentType");
 		} else if (getArguments().containsKey("sourceContentType")) {
 			try {
 				String val = getArguments().getString("sourceContentType");
 				contentType = val == null ? null : ContentType.valueOf(val);
 			} catch (IllegalArgumentException ignored) {}
 		}
 		int contentTypeId = ContentType.getContentTypeRes(contentType);
 		contentTypePopup.getMenu().findItem(contentTypeId).setChecked(true);
 		contentTypeBtn.setSelected(contentTypeId != R.id.content_type_null && contentTypeId != R.id.content_type_plain);
 		autocompleteViewController=new ComposeAutocompleteViewController(getActivity(), accountID);
 		autocompleteViewController.setCompletionSelectedListener(this::onAutocompleteOptionSelected);
 		View autocompleteView=autocompleteViewController.getView();
@@ -513,6 +540,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			outState.putParcelableArrayList("attachments", serializedAttachments);
 		}
 		outState.putSerializable("visibility", statusVisibility);
 		outState.putSerializable("contentType", contentType);
 		if (scheduledAt != null) outState.putSerializable("scheduledAt", scheduledAt);
 		if (scheduledStatus != null) outState.putParcelable("scheduledStatus", Parcels.wrap(scheduledStatus));
 	}
@@ -551,8 +579,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			@Override
 			public void afterTextChanged(Editable s){
-				if(s.length()==0)
+				if(s.length()==0){
 					updateCharCounter();
 					return;
 				}
 				int start=lastChangeStart;
 				int count=lastChangeCount;
 				// offset one char back to catch an already typed '@' or '#' or ':'
@@ -605,7 +635,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			}
 		});
 		spoilerEdit.addTextChangedListener(new SimpleTextWatcher(e->updateCharCounter()));
-		if(replyTo!=null){
+		if(replyTo!=null || quote!=null){
 			Status status = quote!=null ? quote : replyTo;
 			View replyWrap = view.findViewById(R.id.reply_wrap);
 			scrollView.getViewTreeObserver().addOnGlobalLayoutListener(() -> {
 				int scrollHeight = scrollView.getHeight();
@@ -631,13 +662,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			originalPost.setOnClickListener(v->{
 				Bundle args=new Bundle();
 				args.putString("account", accountID);
-				args.putParcelable("status", Parcels.wrap(replyTo));
+				args.putParcelable("status", Parcels.wrap(status));
 				imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
 				Nav.go(getActivity(), ThreadFragment.class, args);
 			});
 			ImageView avatar = view.findViewById(R.id.avatar);
-			ViewImageLoader.load(avatar, null, new UrlImageLoaderRequest(replyTo.account.avatar));
+			ViewImageLoader.load(avatar, null, new UrlImageLoaderRequest(status.account.avatar));
 			ViewOutlineProvider roundCornersOutline=new ViewOutlineProvider(){
 				@Override
 				public void getOutline(View view, Outline outline){
@@ -649,15 +680,15 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			avatar.setOnClickListener(v->{
 				Bundle args=new Bundle();
 				args.putString("account", accountID);
-				args.putParcelable("profileAccount", Parcels.wrap(replyTo.account));
+				args.putParcelable("profileAccount", Parcels.wrap(status.account));
 				imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
 				Nav.go(getActivity(), ProfileFragment.class, args);
 			});
-			((TextView) view.findViewById(R.id.name)).setText(replyTo.account.displayName);
+			((TextView) view.findViewById(R.id.name)).setText(status.account.displayName);
-			((TextView) view.findViewById(R.id.username)).setText(replyTo.account.getDisplayUsername());
+			((TextView) view.findViewById(R.id.username)).setText(status.account.getDisplayUsername());
 			view.findViewById(R.id.visibility).setVisibility(View.GONE);
-			Drawable visibilityIcon = getActivity().getDrawable(switch(replyTo.visibility){
+			Drawable visibilityIcon = getActivity().getDrawable(switch(status.visibility){
 				case PUBLIC -> R.drawable.ic_fluent_earth_20_regular;
 				case UNLISTED -> R.drawable.ic_fluent_lock_open_20_regular;
 				case PRIVATE -> R.drawable.ic_fluent_lock_closed_20_filled;
@@ -668,36 +699,37 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			moreBtn.setImageDrawable(visibilityIcon);
 			moreBtn.setBackground(null);
 			TextView timestamp = view.findViewById(R.id.timestamp);
-			if (replyTo.editedAt==null) timestamp.setText(UiUtils.formatRelativeTimestamp(getContext(), replyTo.createdAt));
+			if (status.editedAt!=null) timestamp.setText(getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(getContext(), status.editedAt)));
-			else timestamp.setText(getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(getContext(), replyTo.editedAt)));
+			else if (status.createdAt!=null) timestamp.setText(UiUtils.formatRelativeTimestamp(getContext(), status.createdAt));
-			if (replyTo.spoilerText != null && !replyTo.spoilerText.isBlank()) {
+			else timestamp.setText("");
 			if (status.spoilerText != null && !status.spoilerText.isBlank()) {
 				view.findViewById(R.id.spoiler_header).setVisibility(View.VISIBLE);
-				((TextView) view.findViewById(R.id.spoiler_title_inline)).setText(replyTo.spoilerText);
+				((TextView) view.findViewById(R.id.spoiler_title_inline)).setText(status.spoilerText);
 			}
-			SpannableStringBuilder content = HtmlParser.parse(replyTo.content, replyTo.emojis, replyTo.mentions, replyTo.tags, accountID);
+			SpannableStringBuilder content = HtmlParser.parse(status.content, status.emojis, status.mentions, status.tags, accountID);
 			LinkedTextView text = view.findViewById(R.id.text);
 			if (content.length() > 0) text.setText(content);
 			else view.findViewById(R.id.display_item_text).setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(16)));
-			replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName));
+			replyText.setText(getString(quote!=null? R.string.sk_quoting_user : R.string.in_reply_to, status.account.displayName));
-			int visibilityNameRes = switch (replyTo.visibility) {
+			int visibilityNameRes = switch (status.visibility) {
 				case PUBLIC -> R.string.visibility_public;
 				case UNLISTED -> R.string.sk_visibility_unlisted;
 				case PRIVATE -> R.string.visibility_followers_only;
 				case DIRECT -> R.string.visibility_private;
 				case LOCAL -> R.string.sk_local_only;
 			};
-			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + getString(visibilityNameRes));
+			replyText.setContentDescription(getString(R.string.in_reply_to, status.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + getString(visibilityNameRes));
 			replyText.setOnClickListener(v->{
 				scrollView.smoothScrollTo(0, 0);
 			});
 			ArrayList<String> mentions=new ArrayList<>();
 			String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
-			if(!replyTo.account.id.equals(ownID))
+			if(!status.account.id.equals(ownID))
-				mentions.add('@'+replyTo.account.acct);
+				mentions.add('@'+status.account.acct);
-			for(Mention mention:replyTo.mentions){
+			for(Mention mention:status.mentions){
 				if(mention.id.equals(ownID))
 					continue;
 				String m='@'+mention.acct;
@@ -710,17 +742,17 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				ignoreSelectionChanges=true;
 				mainEditText.setSelection(mainEditText.length());
 				ignoreSelectionChanges=false;
-				if(!TextUtils.isEmpty(replyTo.spoilerText)){
+				if(!TextUtils.isEmpty(status.spoilerText)){
 					hasSpoiler=true;
 					spoilerEdit.setVisibility(View.VISIBLE);
-					if(GlobalUserPreferences.prefixRepliesWithRe && !replyTo.spoilerText.startsWith("re: ")){
+					if(GlobalUserPreferences.prefixRepliesWithRe && !status.spoilerText.startsWith("re: ")){
-						spoilerEdit.setText("re: " + replyTo.spoilerText);
+						spoilerEdit.setText("re: " + status.spoilerText);
 					}else{
-						spoilerEdit.setText(replyTo.spoilerText);
+						spoilerEdit.setText(status.spoilerText);
 					}
 					spoilerBtn.setSelected(true);
 				}
-				if (replyTo.language != null && !replyTo.language.isEmpty()) updateLanguage(replyTo.language);
+				if (status.language != null && !status.language.isEmpty()) updateLanguage(status.language);
 			}
 		}else if (editingStatus==null || editingStatus.inReplyToId==null){
 			// TODO: remove workaround after https://github.com/mastodon/mastodon-android/issues/341 gets fixed
@@ -900,6 +932,17 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		});
 	}
 	private int getContentTypeName(String id) {
 		return switch (id) {
 			case "text/plain" -> R.string.sk_content_type_plain;
 			case "text/html" -> R.string.sk_content_type_html;
 			case "text/markdown" -> R.string.sk_content_type_markdown;
 			case "text/bbcode" -> R.string.sk_content_type_bbcode;
 			case "text/x.misskeymarkdown" -> R.string.sk_content_type_mfm;
 			default -> throw new IllegalArgumentException("Invalid content type");
 		};
 	}
 	private void addBottomLanguage(Menu menu) {
 		if (menu.findItem(allLanguages.size()) == null) {
 			menu.add(0, allLanguages.size(), Menu.NONE, "bottom (\uD83E\uDD7A\uD83D\uDC49\uD83D\uDC48)");
@@ -971,9 +1014,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 	private void onCustomEmojiClick(Emoji emoji){
-		int start=mainEditText.getSelectionStart();
+		if(getActivity().getCurrentFocus() instanceof EditText edit){
-		String prefix=start>0 && !Character.isWhitespace(mainEditText.getText().charAt(start-1)) ? " :" : ":";
+			int start=edit.getSelectionStart();
-		mainEditText.getText().replace(start, mainEditText.getSelectionEnd(), prefix+emoji.shortcode+':');
+			String prefix=start>0 && !Character.isWhitespace(edit.getText().charAt(start-1)) ? " :" : ":";
 			edit.getText().replace(start, edit.getSelectionEnd(), prefix+emoji.shortcode+':');
 		}
 	}
 	@Override
@@ -1041,9 +1086,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		}
 		req.status=text;
 		req.localOnly=localOnly;
-		req.visibility=localOnly && instance.pleroma != null ? StatusPrivacy.LOCAL : statusVisibility;
+		req.visibility=localOnly && instance.isAkkoma() ? StatusPrivacy.LOCAL : statusVisibility;
 		req.sensitive=sensitive;
 		req.language=language;
 		req.contentType=contentType;
 		req.scheduledAt = scheduledAt;
 		if(!attachments.isEmpty()){
 			req.mediaIds=attachments.stream().map(a->a.serverAttachment.id).collect(Collectors.toList());
@@ -1085,6 +1131,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		if(hasSpoiler && spoilerEdit.length()>0){
 			req.spoilerText=spoilerEdit.getText().toString();
 		}
 		if(quote != null){
 			req.quoteId=quote.id;
 		}
 		if(uuid==null)
 			uuid=UUID.randomUUID().toString();
@@ -1117,7 +1166,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					}else{
 						E.post(new StatusUpdatedEvent(result));
 					}
-					Nav.finish(ComposeFragment.this);
+					if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || !isStateSaved()) {
 						Nav.finish(ComposeFragment.this);
 					}
 					if (getArguments().getBoolean("navigateToStatus", false)) {
 						Bundle args=new Bundle();
 						args.putString("account", accountID);
@@ -1533,7 +1584,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		if(att.isUploadingOrProcessing())
 			att.cancelUpload();
 		attachments.remove(att);
-		uploadNextQueuedAttachment();
+		if(!areThereAnyUploadingAttachments())
 			uploadNextQueuedAttachment();
 		attachmentsView.removeView(att.view);
 		if(getMediaAttachmentsCount()==0)
 			attachmentsView.setVisibility(View.GONE);
@@ -1690,11 +1742,24 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				pollChanged=true;
 			updatePublishButtonState();
 		}));
-		option.edit.setFilters(new InputFilter[]{new InputFilter.LengthFilter(instance.configuration!=null && instance.configuration.polls!=null && instance.configuration.polls.maxCharactersPerOption>0 ? instance.configuration.polls.maxCharactersPerOption : 50)});
+
 		int maxCharactersPerOption = 50;
 		if(instance.configuration!=null && instance.configuration.polls!=null && instance.configuration.polls.maxCharactersPerOption>0)
 			maxCharactersPerOption = instance.configuration.polls.maxCharactersPerOption;
 		else if(instance.pollLimits!=null && instance.pollLimits.maxOptionChars>0)
 			maxCharactersPerOption = instance.pollLimits.maxOptionChars;
 		option.edit.setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxCharactersPerOption)});
 		pollOptionsView.addView(option.view);
 		pollOptions.add(option);
-		if(pollOptions.size()==(instance.configuration!=null && instance.configuration.polls!=null && instance.configuration.polls.maxOptions>0 ? instance.configuration.polls.maxOptions : 4))
+
 		int maxPollOptions = 4;
 		if(instance.configuration!=null && instance.configuration.polls!=null && instance.configuration.polls.maxOptions>0)
 			maxPollOptions = instance.configuration.polls.maxOptions;
 		else if (instance.pollLimits!=null && instance.pollLimits.maxOptions>0)
 			maxPollOptions = instance.pollLimits.maxOptions;
 		if(pollOptions.size()==maxPollOptions)
 			addPollOptionBtn.setVisibility(View.GONE);
 		return option;
 	}
@@ -1836,7 +1901,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		Menu m=visibilityPopup.getMenu();
 		MenuItem localOnlyItem = visibilityPopup.getMenu().findItem(R.id.local_only);
 		boolean prefsSaysSupported = GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID);
-		if (instance.pleroma != null) {
+		if (instance.isAkkoma()) {
 			m.findItem(R.id.vis_local).setVisible(true);
 		} else if (localOnly || prefsSaysSupported) {
 			localOnlyItem.setVisible(true);
@@ -1880,14 +1945,36 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		});
 	}
 	@SuppressLint("ClickableViewAccessibility")
 	private void buildContentTypePopup(View btn) {
 		contentTypePopup=new PopupMenu(getActivity(), btn);
 		contentTypePopup.inflate(R.menu.compose_content_type);
 		Menu m = contentTypePopup.getMenu();
 		ContentType.adaptMenuToInstance(m, instance);
 		if (contentType != null) m.findItem(R.id.content_type_null).setVisible(false);
 		contentTypePopup.setOnMenuItemClickListener(i->{
 			int id=i.getItemId();
 			if (id == R.id.content_type_null) contentType = null;
 			else if (id == R.id.content_type_plain) contentType = ContentType.PLAIN;
 			else if (id == R.id.content_type_html) contentType = ContentType.HTML;
 			else if (id == R.id.content_type_markdown) contentType = ContentType.MARKDOWN;
 			else if (id == R.id.content_type_bbcode) contentType = ContentType.BBCODE;
 			else if (id == R.id.content_type_misskey_markdown) contentType = ContentType.MISSKEY_MARKDOWN;
 			else return false;
 			btn.setSelected(id != R.id.content_type_null && id != R.id.content_type_plain);
 			i.setChecked(true);
 			return true;
 		});
 		if (!GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID)) {
 			btn.setVisibility(View.GONE);
 		}
 	}
 	private void loadDefaultStatusVisibility(Bundle savedInstanceState) {
 		if(replyTo != null) statusVisibility = replyTo.visibility;
 		// A saved privacy setting from a previous compose session wins over the reply visibility
 		if(savedInstanceState !=null){
 			statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
 		}
 		AccountSessionManager asm = AccountSessionManager.getInstance();
 		Preferences prefs = asm.getAccount(accountID).preferences;
 		if (prefs != null) {
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
@@ -30,8 +30,11 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.ui.DividerItemDecoration;
@@ -47,11 +50,10 @@ import java.util.Map;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
-public class EditTimelinesFragment extends BaseRecyclerFragment<TimelineDefinition> implements ScrollableToTop {
+public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition> implements ScrollableToTop {
    private String accountID;
    private TimelinesAdapter adapter;
    private final ItemTouchHelper itemTouchHelper;
@@ -165,7 +167,7 @@ public class EditTimelinesFragment extends BaseRecyclerFragment<TimelineDefiniti
        makeBackItem(listsMenu);
        makeBackItem(hashtagsMenu);
-        TimelineDefinition.ALL_TIMELINES.forEach(tl -> addTimelineToOptions(tl, timelinesMenu));
+        TimelineDefinition.getAllTimelines(accountID).forEach(tl -> addTimelineToOptions(tl, timelinesMenu));
        listTimelines.stream().map(TimelineDefinition::ofList).forEach(tl -> addTimelineToOptions(tl, listsMenu));
        hashtags.stream().map(TimelineDefinition::ofHashtag).forEach(tl -> addTimelineToOptions(tl, hashtagsMenu));
@@ -191,7 +193,7 @@ public class EditTimelinesFragment extends BaseRecyclerFragment<TimelineDefiniti
    @Override
    protected void doLoadData(int offset, int count){
-        onDataLoaded(GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.DEFAULT_TIMELINES), false);
+        onDataLoaded(GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.getDefaultTimelines(accountID)), false);
        updateOptionsMenu();
    }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FavoritedStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FavoritedStatusListFragment.java
@@ -1,9 +1,11 @@
 package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.net.Uri;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetFavoritedStatuses;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Status;
@@ -35,4 +37,16 @@ public class FavoritedStatusListFragment extends StatusListFragment{
 				})
 				.exec(accountID);
 	}
 	@Override
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.ACCOUNT;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return base.encodedPath(isInstanceAkkoma()
 				? '/' + getSession().self.username + "#favorites"
 				: "/favourites").build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.graphics.Rect;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -24,6 +25,7 @@ import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ProgressBarButton;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 import java.util.Collections;
@@ -38,7 +40,6 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -47,7 +48,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
-public class FollowRequestsListFragment extends BaseRecyclerFragment<FollowRequestsListFragment.AccountWrapper> implements ScrollableToTop{
+public class FollowRequestsListFragment extends RecyclerFragment<FollowRequestsListFragment.AccountWrapper> implements ScrollableToTop, ProvidesAssistContent.ProvidesWebUri {
 	private String accountID;
 	private Map<String, Relationship> relationships=Collections.emptyMap();
 	private GetAccountRelationships relationshipsRequest;
@@ -149,6 +150,16 @@ public class FollowRequestsListFragment extends BaseRecyclerFragment<FollowReque
 		smoothScrollRecyclerViewToTop(list);
 	}
 	@Override
 	public String getAccountID() {
 		return accountID;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return base.path(isInstanceAkkoma() ? "/friend-requests" : "/follow_requests").build();
 	}
 	private class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
 		public AccountsAdapter(){
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,15 +15,15 @@ import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
-public class FollowedHashtagsFragment extends BaseRecyclerFragment<Hashtag> implements ScrollableToTop {
+public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implements ScrollableToTop, ProvidesAssistContent.ProvidesWebUri {
    private String nextMaxID;
-    private String accountId;
+    private String accountID;
    public FollowedHashtagsFragment() {
        super(20);
@@ -32,7 +33,7 @@ public class FollowedHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        Bundle args=getArguments();
-        accountId=args.getString("account");
+        accountID=args.getString("account");
        setTitle(R.string.sk_hashtags_you_follow);
    }
@@ -63,7 +64,7 @@ public class FollowedHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
                        onDataLoaded(result, nextMaxID!=null);
                    }
                })
-                .exec(accountId);
+                .exec(accountID);
    }
    @Override
@@ -76,6 +77,16 @@ public class FollowedHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
        smoothScrollRecyclerViewToTop(list);
    }
    @Override
    public String getAccountID() {
        return accountID;
    }
    @Override
    public Uri getWebUri(Uri.Builder base) {
        return isInstanceAkkoma() ? null : base.path("/followed_tags").build();
    }
    private class HashtagsAdapter extends RecyclerView.Adapter<HashtagViewHolder>{
        @NonNull
        @Override
@@ -110,7 +121,7 @@ public class FollowedHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
        @Override
        public void onClick() {
-            UiUtils.openHashtagTimeline(getActivity(), accountId, item.name, item.following);
+            UiUtils.openHashtagTimeline(getActivity(), accountID, item.name, item.following);
        }
    }
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HasAccountID.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HasAccountID.java
@@ -0,0 +1,23 @@
 package org.joinmastodon.android.fragments;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Instance;
 import java.util.Optional;
 public interface HasAccountID {
    String getAccountID();
    default AccountSession getSession() {
        return AccountSessionManager.getInstance().getAccount(getAccountID());
    }
    default boolean isInstanceAkkoma() {
        return getInstance().map(Instance::isAkkoma).orElse(false);
    }
    default Optional<Instance> getInstance() {
        return getSession().getInstance();
    }
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HasFab.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HasFab.java
@@ -0,0 +1,10 @@
 package org.joinmastodon.android.fragments;
 import android.view.View;
 public interface HasFab {
    View getFab();
    void showFab();
    void hideFab();
    boolean isScrolling();
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.HapticFeedbackConstants;
 import android.view.Menu;
@@ -8,7 +9,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.Toast;
 import org.joinmastodon.android.E;
@@ -39,7 +39,7 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 	private MenuItem followButton;
 	@Override
-	protected boolean withComposeButton() {
+	protected boolean wantsComposeButton() {
 		return true;
 	}
@@ -123,7 +123,7 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 					@Override
 					public void onSuccess(List<Status> result){
 						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
+						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -138,12 +138,12 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 	}
 	@Override
-	protected boolean onFabLongClick(View v) {
+	public boolean onFabLongClick(View v) {
 		return UiUtils.pickAccountForCompose(getActivity(), accountID, '#'+hashtag+' ');
 	}
 	@Override
-	protected void onFabClick(View v){
+	public void onFabClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		args.putString("prefilledText", '#'+hashtag+' ');
@@ -154,4 +154,14 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 	protected void onSetFabBottomInset(int inset){
 		((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(24)+inset;
 	}
 	@Override
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.PUBLIC;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return base.path((isInstanceAkkoma() ? "/tag/" : "/tags") + hashtag).build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
@@ -2,6 +2,7 @@ package org.joinmastodon.android.fragments;
 import android.app.Fragment;
 import android.app.NotificationManager;
 import android.app.assist.AssistContent;
 import android.graphics.Outline;
 import android.os.Build;
 import android.os.Bundle;
@@ -16,21 +17,36 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import androidx.annotation.IdRes;
 import androidx.annotation.Nullable;
 import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.notifications.GetNotifications;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.AllNotificationsSeenEvent;
 import org.joinmastodon.android.events.NotificationReceivedEvent;
 import org.joinmastodon.android.fragments.discover.DiscoverFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.TabBar;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
 import androidx.annotation.IdRes;
 import androidx.annotation.Nullable;
 import me.grishka.appkit.FragmentStackActivity;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.AppKitFragment;
 import me.grishka.appkit.fragments.LoaderFragment;
 import me.grishka.appkit.fragments.OnBackPressedListener;
@@ -39,7 +55,7 @@ import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
-public class HomeFragment extends AppKitFragment implements OnBackPressedListener{
+public class HomeFragment extends AppKitFragment implements OnBackPressedListener, ProvidesAssistContent, HasAccountID {
 	private FragmentRootLinearLayout content;
 	private HomeTabFragment homeTabFragment;
 	private NotificationsFragment notificationsFragment;
@@ -48,26 +64,34 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	private TabBar tabBar;
 	private View tabBarWrap;
 	private ImageView tabBarAvatar;
 	private ImageView notificationTabIcon;
 	@IdRes
 	private int currentTab=R.id.tab_home;
 	private String accountID;
 	private boolean isPleroma;
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		E.register(this);
 		accountID=getArguments().getString("account");
 		setTitle(R.string.sk_app_name);
 		isPleroma = AccountSessionManager.getInstance().getAccount(accountID).getInstance()
 				.map(Instance::isAkkoma)
 				.orElse(false);
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
 		// TODO: clean up
 		if(savedInstanceState==null){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			homeTabFragment=new HomeTabFragment();
 			homeTabFragment.setArguments(args);
 			args=new Bundle(args);
 			args.putBoolean("disableDiscover", isPleroma);
 			args.putBoolean("noAutoLoad", true);
 			searchFragment=new DiscoverFragment();
 			searchFragment.setArguments(args);
@@ -89,7 +113,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		content.setOrientation(LinearLayout.VERTICAL);
 		FrameLayout fragmentContainer=new FrameLayout(getActivity());
-		fragmentContainer.setId(R.id.fragment_wrap);
+		fragmentContainer.setId(me.grishka.appkit.R.id.fragment_wrap);
 		content.addView(fragmentContainer, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f));
 		inflater.inflate(R.layout.tab_bar, content);
@@ -108,12 +132,15 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		Account self=AccountSessionManager.getInstance().getAccount(accountID).self;
 		ViewImageLoader.load(tabBarAvatar, null, new UrlImageLoaderRequest(self.avatar, V.dp(28), V.dp(28)));
 		notificationTabIcon=content.findViewById(R.id.tab_notifications);
 		updateNotificationBadge();
 		if(savedInstanceState==null){
 			getChildFragmentManager().beginTransaction()
-					.add(R.id.fragment_wrap, homeTabFragment)
+					.add(me.grishka.appkit.R.id.fragment_wrap, homeTabFragment)
-					.add(R.id.fragment_wrap, searchFragment).hide(searchFragment)
+					.add(me.grishka.appkit.R.id.fragment_wrap, searchFragment).hide(searchFragment)
-					.add(R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment)
+					.add(me.grishka.appkit.R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment)
-					.add(R.id.fragment_wrap, profileFragment).hide(profileFragment)
+					.add(me.grishka.appkit.R.id.fragment_wrap, profileFragment).hide(profileFragment)
 					.commit();
 			String defaultTab=getArguments().getString("tab");
@@ -142,6 +169,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		notificationsFragment=(NotificationsFragment) getChildFragmentManager().getFragment(savedInstanceState, "notificationsFragment");
 		profileFragment=(ProfileFragment) getChildFragmentManager().getFragment(savedInstanceState, "profileFragment");
 		currentTab=savedInstanceState.getInt("selectedTab");
 		tabBar.selectTab(currentTab);
 		Fragment current=fragmentForTab(currentTab);
 		getChildFragmentManager().beginTransaction()
 				.hide(homeTabFragment)
@@ -198,6 +226,13 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		throw new IllegalArgumentException();
 	}
 	public void setCurrentTab(@IdRes int tab){
 		if(tab==currentTab)
 			return;
 		tabBar.selectTab(tab);
 		onTabSelected(tab);
 	}
 	private void onTabSelected(@IdRes int tab){
 		Fragment newFragment=fragmentForTab(tab);
 		if(tab==currentTab){
@@ -209,8 +244,10 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		}
 		getChildFragmentManager().beginTransaction().hide(fragmentForTab(currentTab)).show(newFragment).commit();
 		maybeTriggerLoading(newFragment);
 		if (newFragment instanceof HasFab fabulous && !fabulous.isScrolling()) fabulous.showFab();
 		currentTab=tab;
 		((FragmentStackActivity)getActivity()).invalidateSystemBarColors(this);
 		if (tab == R.id.tab_search && isPleroma) searchFragment.selectSearch();
 	}
 	private void maybeTriggerLoading(Fragment newFragment){
@@ -237,7 +274,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){
 				options.add(session.self.displayName+"\n("+session.self.username+"@"+session.domain+")");
 			}
-			new AccountSwitcherSheet(getActivity()).show();
+			new AccountSwitcherSheet(getActivity(), this).show();
 			return true;
 		}
 		return false;
@@ -267,4 +304,57 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		if (notificationsFragment.isAdded()) getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
 		if (profileFragment.isAdded()) getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment);
 	}
 	public void updateNotificationBadge() {
 		AccountSession session = AccountSessionManager.getInstance().getAccount(accountID);
 		Optional<Instance> instance = session.getInstance();
 		if (instance.isEmpty()) return; // avoiding incompatibility with akkoma
 		new GetNotifications(null, 1, EnumSet.allOf(Notification.Type.class), instance.get().isAkkoma())
 				.setCallback(new Callback<>() {
 					@Override
 					public void onSuccess(List<Notification> notifications) {
 						if (notifications.size() > 0) {
 							try {
 								long newestId = Long.parseLong(notifications.get(0).id);
 								long lastSeenId = Long.parseLong(session.markers.notifications.lastReadId);
 								setNotificationBadge(newestId > lastSeenId);
 							} catch (Exception ignored) {
 								setNotificationBadge(false);
 							}
 						}
 					}
 					@Override
 					public void onError(ErrorResponse error) {
 						setNotificationBadge(false);
 					}
 				}).exec(accountID);
 	}
 	public void setNotificationBadge(boolean badge) {
 		notificationTabIcon.setImageResource(badge
 				? R.drawable.ic_fluent_alert_28_selector_badged
 				: R.drawable.ic_fluent_alert_28_selector);
 	}
 	@Subscribe
 	public void onNotificationReceived(NotificationReceivedEvent notificationReceivedEvent) {
 		if (notificationReceivedEvent.account.equals(accountID)) setNotificationBadge(true);
 	}
 	@Subscribe
 	public void onAllNotificationsSeen(AllNotificationsSeenEvent allNotificationsSeenEvent) {
 		setNotificationBadge(false);
 	}
 	@Override
 	public String getAccountID() {
 		return accountID;
 	}
 	@Override
 	public void onProvideAssistContent(AssistContent assistContent) {
 		callFragmentToProvideAssistContent(fragmentForTab(currentTab), assistContent);
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
@@ -10,6 +10,7 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
 import android.app.assist.AssistContent;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
@@ -24,6 +25,7 @@ import android.view.ViewParent;
 import android.view.ViewTreeObserver;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
@@ -53,6 +55,7 @@ import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import java.util.Collection;
 import java.util.HashMap;
@@ -70,7 +73,7 @@ import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
-public class HomeTabFragment extends MastodonToolbarFragment implements ScrollableToTop, OnBackPressedListener {
+public class HomeTabFragment extends MastodonToolbarFragment implements ScrollableToTop, OnBackPressedListener, HasFab, ProvidesAssistContent {
 	private static final int ANNOUNCEMENTS_RESULT = 654;
 	private String accountID;
@@ -98,13 +101,14 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 	private PopupMenu overflowPopup;
 	private View overflowActionView = null;
 	private boolean announcementsBadged, settingsBadged;
 	private ImageButton fab;
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		E.register(this);
 		accountID = getArguments().getString("account");
-		timelineDefinitions = GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.DEFAULT_TIMELINES);
+		timelineDefinitions = GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.getDefaultTimelines(accountID));
 		assert timelineDefinitions != null;
 		if (timelineDefinitions.size() == 0) timelineDefinitions = List.of(TimelineDefinition.HOME_TIMELINE);
 		count = timelineDefinitions.size();
@@ -122,6 +126,10 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 	@Override
 	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
 		FrameLayout view = new FrameLayout(getContext());
 		inflater.inflate(R.layout.compose_fab, view);
 		fab = view.findViewById(R.id.fab);
 		fab.setOnClickListener(this::onFabClick);
 		fab.setOnLongClickListener(this::onFabLongClick);
 		pager = new ViewPager2(getContext());
 		toolbarFrame = (FrameLayout) LayoutInflater.from(getContext()).inflate(R.layout.home_toolbar, getToolbar(), false);
@@ -129,6 +137,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 			Bundle args = new Bundle();
 			args.putString("account", accountID);
 			args.putBoolean("__is_tab", true);
 			args.putBoolean("__disable_fab", true);
 			args.putBoolean("onlyPosts", true);
 			for (int i = 0; i < timelineDefinitions.size(); i++) {
@@ -280,6 +289,20 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		}).exec(accountID);
 	}
 	private void onFabClick(View v){
 		if (fragments[pager.getCurrentItem()] instanceof BaseStatusListFragment<?> l) {
 			l.onFabClick(v);
 		}
 	}
 	private boolean onFabLongClick(View v) {
 		if (fragments[pager.getCurrentItem()] instanceof BaseStatusListFragment<?> l) {
 			return l.onFabLongClick(v);
 		} else {
 			return false;
 		}
 	}
 	private void addListsToOverflowMenu() {
 		Context ctx = getContext();
 		listsMenu.clear();
@@ -358,7 +381,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		addListsToOverflowMenu();
 		addHashtagsToOverflowMenu();
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && !UiUtils.isEMUI()) {
 			m.setGroupDividerEnabled(true);
 		}
 	}
@@ -427,9 +450,26 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		updateSwitcherIcon(i);
 	}
 	@Override
 	public void showFab() {
 		if (fragments[pager.getCurrentItem()] instanceof BaseStatusListFragment<?> l) l.showFab();
 	}
 	@Override
 	public void hideFab() {
 		if (fragments[pager.getCurrentItem()] instanceof BaseStatusListFragment<?> l) l.hideFab();
 	}
 	@Override
 	public boolean isScrolling() {
 		return (fragments[pager.getCurrentItem()] instanceof HasFab fabulous)
 				&& fabulous.isScrolling();
 	}
 	private void updateSwitcherIcon(int i) {
 		timelineIcon.setImageResource(timelines[i].getIcon().iconRes);
 		timelineTitle.setText(timelines[i].getTitle(getContext()));
 		showFab();
 	}
 	@Override
@@ -657,6 +697,15 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		return hashtagsItems.values();
 	}
 	public ImageButton getFab() {
 		return fab;
 	}
 	@Override
 	public void onProvideAssistContent(AssistContent assistContent) {
 		callFragmentToProvideAssistContent(fragments[pager.getCurrentItem()], assistContent);
 	}
 	private class HomePagerAdapter extends RecyclerView.Adapter<SimpleViewHolder> {
 		@NonNull
 		@Override
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
@@ -8,8 +9,6 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
@@ -38,7 +37,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 	private String lastSavedMarkerID;
 	@Override
-	protected boolean withComposeButton() {
+	protected boolean wantsComposeButton() {
 		return true;
 	}
@@ -150,7 +149,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 							result.get(result.size()-1).hasGapAfter=true;
 							toAdd=result;
 						}
-						StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, Filter.FilterContext.HOME);
+						StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, getFilterContext());
 						toAdd=toAdd.stream().filter(filterPredicate).collect(Collectors.toList());
 						if(!toAdd.isEmpty()){
 							prependItems(toAdd, true);
@@ -166,6 +165,10 @@ public class HomeTimelineFragment extends StatusListFragment {
 					}
 				})
 				.exec(accountID);
 		if (parent.getParentFragment() instanceof HomeFragment homeFragment) {
 			homeFragment.updateNotificationBadge();
 		}
 	}
 	@Override
@@ -225,7 +228,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 							List<StatusDisplayItem> targetList=displayItems.subList(gapPos, gapPos+1);
 							targetList.clear();
 							List<Status> insertedPosts=data.subList(gapPostIndex+1, gapPostIndex+1);
-							StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, Filter.FilterContext.HOME);
+							StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, getFilterContext());
 							for(Status s:result){
 								if(idsBelowGap.contains(s.id))
 									break;
@@ -278,4 +281,14 @@ public class HomeTimelineFragment extends StatusListFragment {
 	protected boolean shouldRemoveAccountPostsWhenUnfollowing(){
 		return true;
 	}
 	@Override
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.HOME;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return base.path("/").build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
@@ -1,13 +1,13 @@
 package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
 import androidx.annotation.Nullable;
@@ -44,7 +44,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
    private ListTimeline.RepliesPolicy repliesPolicy;
    @Override
-    protected boolean withComposeButton() {
+    protected boolean wantsComposeButton() {
        return true;
    }
@@ -137,7 +137,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
                    @Override
                    public void onSuccess(List<Status> result) {
                        if (getActivity() == null) return;
-                        result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.HOME)).collect(Collectors.toList());
+                        result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
                        onDataLoaded(result, !result.isEmpty());
                    }
                })
@@ -152,7 +152,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
    }
    @Override
-    protected void onFabClick(View v){
+    public void onFabClick(View v){
        Bundle args=new Bundle();
        args.putString("account", accountID);
        Nav.go(getActivity(), ComposeFragment.class, args);
@@ -162,4 +162,15 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
    protected void onSetFabBottomInset(int inset) {
        ((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(24)+inset;
    }
    @Override
    protected Filter.FilterContext getFilterContext() {
        return Filter.FilterContext.HOME;
    }
    @Override
    public Uri getWebUri(Uri.Builder base) {
        return base.path("/lists/" + listID).build();
    }
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
@@ -1,259 +0,0 @@
 package org.joinmastodon.android.fragments;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
 import org.joinmastodon.android.api.requests.lists.CreateList;
 import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
 import org.joinmastodon.android.events.ListDeletedEvent;
 import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
 import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.views.ListTimelineEditor;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> implements ScrollableToTop {
 	private String accountId;
 	private String profileAccountId;
 	private final HashMap<String, Boolean> userInListBefore = new HashMap<>();
 	private final HashMap<String, Boolean> userInList = new HashMap<>();
 	private ListsAdapter adapter;
 	public ListTimelinesFragment() {
 		 super(10);
 	}
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		 super.onCreate(savedInstanceState);
 		 Bundle args=getArguments();
 		 accountId=args.getString("account");
 		 setHasOptionsMenu(true);
 		 E.register(this);
 		 if(args.containsKey("profileAccount")){
 				profileAccountId=args.getString("profileAccount");
 				String profileDisplayUsername = args.getString("profileDisplayUsername");
 				setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
 		 } else {
 				setTitle(R.string.sk_your_lists);
 		 }
 	}
 	@Override
 	protected void onShown(){
 		 super.onShown();
 		 if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
 				loadData();
 	}
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState) {
 		 super.onViewCreated(view, savedInstanceState);
 		 list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
 	}
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		 inflater.inflate(R.menu.menu_list, menu);
 	}
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		 if (item.getItemId() == R.id.create) {
 				ListTimelineEditor editor = new ListTimelineEditor(getContext());
 				new M3AlertDialogBuilder(getActivity())
 						 .setTitle(R.string.sk_create_list_title)
 						 .setIcon(R.drawable.ic_fluent_people_add_28_regular)
 						 .setView(editor)
 						 .setPositiveButton(R.string.sk_create, (d, which) ->
 									new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
 										 @Override
 										 public void onSuccess(ListTimeline list) {
 												data.add(0, list);
 												adapter.notifyItemRangeInserted(0, 1);
 												E.post(new ListUpdatedCreatedEvent(list.id, list.title, list.repliesPolicy));
 										 }
 										 @Override
 										 public void onError(ErrorResponse error) {
 												error.showToast(getContext());
 										 }
 									}).exec(accountId)
 						 )
 						 .setNegativeButton(R.string.cancel, (d, which) -> {})
 						 .show();
 		 }
 		 return true;
 	}
 	private void saveListMembership(String listId, boolean isMember) {
 		 userInList.put(listId, isMember);
 		 List<String> accountIdList = Collections.singletonList(profileAccountId);
 		 MastodonAPIRequest<Object> req = isMember ? new AddAccountsToList(listId, accountIdList) : new RemoveAccountsFromList(listId, accountIdList);
 		 req.setCallback(new Callback<>() {
 			 @Override
 			 public void onSuccess(Object o) {}
 			 @Override
 			 public void onError(ErrorResponse error) {
 				error.showToast(getContext());
 			 }
 		 }).exec(accountId);
 	}
 	@Override
 	protected void doLoadData(int offset, int count){
 		 userInListBefore.clear();
 		 userInList.clear();
 		 currentRequest=(profileAccountId != null ? new GetLists(profileAccountId) : new GetLists())
 					.setCallback(new SimpleCallback<>(this) {
 						 @Override
 						 public void onSuccess(List<ListTimeline> lists) {
 								if (getActivity() == null) return;
 								for (ListTimeline l : lists) userInListBefore.put(l.id, true);
 								userInList.putAll(userInListBefore);
 								if (profileAccountId == null || !lists.isEmpty()) onDataLoaded(lists, false);
 								if (profileAccountId == null) return;
 								currentRequest=new GetLists().setCallback(new SimpleCallback<>(ListTimelinesFragment.this) {
 									@Override
 									public void onSuccess(List<ListTimeline> allLists) {
 										if (getActivity() == null) return;
 										List<ListTimeline> newLists = new ArrayList<>();
 										for (ListTimeline l : allLists) {
 											if (lists.stream().noneMatch(e -> e.id.equals(l.id))) newLists.add(l);
 											if (!userInListBefore.containsKey(l.id)) {
 													userInListBefore.put(l.id, false);
 											}
 										}
 										userInList.putAll(userInListBefore);
 										onDataLoaded(newLists, false);
 									}
 								}).exec(accountId);
 						 }
 					})
 					.exec(accountId);
 	}
 	@Subscribe
 	public void onListDeletedEvent(ListDeletedEvent event) {
 		for (int i = 0; i < data.size(); i++) {
 			ListTimeline item = data.get(i);
 			if (item.id.equals(event.id)) {
 				data.remove(i);
 				adapter.notifyItemRemoved(i);
 				break;
 			}
 		}
 	}
 	@Subscribe
 	public void onListUpdatedCreatedEvent(ListUpdatedCreatedEvent event) {
 		for (int i = 0; i < data.size(); i++) {
 			ListTimeline item = data.get(i);
 			if (item.id.equals(event.id)) {
 				item.title = event.title;
 				item.repliesPolicy = event.repliesPolicy;
 				adapter.notifyItemChanged(i);
 				break;
 			}
 		}
 	}
 	@Override
 	protected RecyclerView.Adapter<ListViewHolder> getAdapter() {
 		 return adapter = new ListsAdapter();
 	}
 	@Override
 	public void scrollToTop() {
 		 smoothScrollRecyclerViewToTop(list);
 	}
 	private class ListsAdapter extends RecyclerView.Adapter<ListViewHolder>{
 		 @NonNull
 		 @Override
 		 public ListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
 				return new ListViewHolder();
 		 }
 		 @Override
 		 public void onBindViewHolder(@NonNull ListViewHolder holder, int position) {
 				holder.bind(data.get(position));
 		 }
 		 @Override
 		 public int getItemCount() {
 				return data.size();
 		 }
 	}
 	private class ListViewHolder extends BindableViewHolder<ListTimeline> implements UsableRecyclerView.Clickable{
 		 private final TextView title;
 		 private final CheckBox listToggle;
 		 public ListViewHolder(){
 				super(getActivity(), R.layout.item_text, list);
 				title=findViewById(R.id.title);
 				listToggle=findViewById(R.id.list_toggle);
 		 }
 		 @Override
 		 public void onBind(ListTimeline item) {
 				title.setText(item.title);
 				title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_24_regular), null, null, null);
 				if (profileAccountId != null) {
 					Boolean checked = userInList.get(item.id);
 					listToggle.setVisibility(View.VISIBLE);
 					listToggle.setChecked(userInList.containsKey(item.id) && checked != null && checked);
 					listToggle.setOnClickListener(this::onClickToggle);
 				} else {
 					listToggle.setVisibility(View.GONE);
 				}
 		 }
 		 private void onClickToggle(View view) {
 				saveListMembership(item.id, listToggle.isChecked());
 		 }
 		 @Override
 		 public void onClick() {
 				Bundle args=new Bundle();
 				args.putString("account", accountId);
 				args.putString("listID", item.id);
 				args.putString("listTitle", item.title);
 				if (item.repliesPolicy != null) args.putInt("repliesPolicy", item.repliesPolicy.ordinal());
 				Nav.go(getActivity(), ListTimelineFragment.class, args);
 		 }
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListsFragment.java
@@ -0,0 +1,270 @@
 package org.joinmastodon.android.fragments;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
 import org.joinmastodon.android.api.requests.lists.CreateList;
 import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
 import org.joinmastodon.android.events.ListDeletedEvent;
 import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
 import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.views.ListTimelineEditor;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 public class ListsFragment extends RecyclerFragment<ListTimeline> implements ScrollableToTop, ProvidesAssistContent.ProvidesWebUri {
 	private String accountID;
 	private String profileAccountId;
 	private final HashMap<String, Boolean> userInListBefore = new HashMap<>();
 	private final HashMap<String, Boolean> userInList = new HashMap<>();
 	private ListsAdapter adapter;
 	public ListsFragment() {
 		super(10);
 	}
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		Bundle args = getArguments();
 		accountID = args.getString("account");
 		setHasOptionsMenu(true);
 		E.register(this);
 		if(args.containsKey("profileAccount")){
 			profileAccountId=args.getString("profileAccount");
 			String profileDisplayUsername = args.getString("profileDisplayUsername");
 			setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
 		} else {
 			setTitle(R.string.sk_your_lists);
 		}
 	}
 	@Override
 	protected void onShown(){
 		super.onShown();
 		if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
 			loadData();
 	}
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState) {
 		super.onViewCreated(view, savedInstanceState);
 		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
 	}
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		inflater.inflate(R.menu.menu_list, menu);
 	}
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		if (item.getItemId() == R.id.create) {
 			ListTimelineEditor editor = new ListTimelineEditor(getContext());
 			new M3AlertDialogBuilder(getActivity())
 					.setTitle(R.string.sk_create_list_title)
 					.setIcon(R.drawable.ic_fluent_people_add_28_regular)
 					.setView(editor)
 					.setPositiveButton(R.string.sk_create, (d, which) ->
 							new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
 								@Override
 								public void onSuccess(ListTimeline list) {
 									data.add(0, list);
 									adapter.notifyItemRangeInserted(0, 1);
 									E.post(new ListUpdatedCreatedEvent(list.id, list.title, list.repliesPolicy));
 								}
 								@Override
 								public void onError(ErrorResponse error) {
 									error.showToast(getContext());
 								}
 							}).exec(accountID)
 					)
 					.setNegativeButton(R.string.cancel, (d, which) -> {})
 					.show();
 		}
 		return true;
 	}
 	private void saveListMembership(String listId, boolean isMember) {
 		userInList.put(listId, isMember);
 		List<String> accountIdList = Collections.singletonList(profileAccountId);
 		MastodonAPIRequest<Object> req = isMember ? new AddAccountsToList(listId, accountIdList) : new RemoveAccountsFromList(listId, accountIdList);
 		req.setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(Object o) {}
 			@Override
 			public void onError(ErrorResponse error) {
 				error.showToast(getContext());
 			}
 		}).exec(accountID);
 	}
 	@Override
 	protected void doLoadData(int offset, int count){
 		userInListBefore.clear();
 		userInList.clear();
 		currentRequest=(profileAccountId != null ? new GetLists(profileAccountId) : new GetLists())
 				.setCallback(new SimpleCallback<>(this) {
 					@Override
 					public void onSuccess(List<ListTimeline> lists) {
 						if (getActivity() == null) return;
 						for (ListTimeline l : lists) userInListBefore.put(l.id, true);
 						userInList.putAll(userInListBefore);
 						if (profileAccountId == null || !lists.isEmpty()) onDataLoaded(lists, false);
 						if (profileAccountId == null) return;
 						currentRequest=new GetLists().setCallback(new SimpleCallback<>(ListsFragment.this) {
 							@Override
 							public void onSuccess(List<ListTimeline> allLists) {
 								if (getActivity() == null) return;
 								List<ListTimeline> newLists = new ArrayList<>();
 								for (ListTimeline l : allLists) {
 									if (lists.stream().noneMatch(e -> e.id.equals(l.id))) newLists.add(l);
 									if (!userInListBefore.containsKey(l.id)) {
 										userInListBefore.put(l.id, false);
 									}
 								}
 								userInList.putAll(userInListBefore);
 								onDataLoaded(newLists, false);
 							}
 						}).exec(accountID);
 					}
 				})
 				.exec(accountID);
 	}
 	@Subscribe
 	public void onListDeletedEvent(ListDeletedEvent event) {
 		for (int i = 0; i < data.size(); i++) {
 			ListTimeline item = data.get(i);
 			if (item.id.equals(event.id)) {
 				data.remove(i);
 				adapter.notifyItemRemoved(i);
 				break;
 			}
 		}
 	}
 	@Subscribe
 	public void onListUpdatedCreatedEvent(ListUpdatedCreatedEvent event) {
 		for (int i = 0; i < data.size(); i++) {
 			ListTimeline item = data.get(i);
 			if (item.id.equals(event.id)) {
 				item.title = event.title;
 				item.repliesPolicy = event.repliesPolicy;
 				adapter.notifyItemChanged(i);
 				break;
 			}
 		}
 	}
 	@Override
 	protected RecyclerView.Adapter<ListViewHolder> getAdapter() {
 		return adapter = new ListsAdapter();
 	}
 	@Override
 	public void scrollToTop() {
 		smoothScrollRecyclerViewToTop(list);
 	}
 	@Override
 	public String getAccountID() {
 		return accountID;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return base.path("/lists").build();
 	}
 	private class ListsAdapter extends RecyclerView.Adapter<ListViewHolder>{
 		@NonNull
 		@Override
 		public ListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
 			return new ListViewHolder();
 		}
 		@Override
 		public void onBindViewHolder(@NonNull ListViewHolder holder, int position) {
 			holder.bind(data.get(position));
 		}
 		@Override
 		public int getItemCount() {
 			return data.size();
 		}
 	}
 	private class ListViewHolder extends BindableViewHolder<ListTimeline> implements UsableRecyclerView.Clickable{
 		private final TextView title;
 		private final CheckBox listToggle;
 		public ListViewHolder(){
 			super(getActivity(), R.layout.item_text, list);
 			title=findViewById(R.id.title);
 			listToggle=findViewById(R.id.list_toggle);
 		}
 		@Override
 		public void onBind(ListTimeline item) {
 			title.setText(item.title);
 			title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_24_regular), null, null, null);
 			if (profileAccountId != null) {
 				Boolean checked = userInList.get(item.id);
 				listToggle.setVisibility(View.VISIBLE);
 				listToggle.setChecked(userInList.containsKey(item.id) && checked != null && checked);
 				listToggle.setOnClickListener(this::onClickToggle);
 			} else {
 				listToggle.setVisibility(View.GONE);
 			}
 		}
 		private void onClickToggle(View view) {
 			saveListMembership(item.id, listToggle.isChecked());
 		}
 		@Override
 		public void onClick() {
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			args.putString("listID", item.id);
 			args.putString("listTitle", item.title);
 			if (item.repliesPolicy != null) args.putInt("repliesPolicy", item.repliesPolicy.ordinal());
 			Nav.go(getActivity(), ListTimelineFragment.class, args);
 		}
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
@@ -2,6 +2,7 @@ package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.assist.AssistContent;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -13,6 +14,12 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager2.widget.ViewPager2;
 import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
@@ -24,12 +31,7 @@ import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
 import org.joinmastodon.android.ui.utils.UiUtils;
-
+import org.joinmastodon.android.utils.ProvidesAssistContent;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager2.widget.ViewPager2;
 import com.squareup.otto.Subscribe;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
@@ -37,7 +39,7 @@ import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.V;
-public class NotificationsFragment extends MastodonToolbarFragment implements ScrollableToTop{
+public class NotificationsFragment extends MastodonToolbarFragment implements ScrollableToTop, ProvidesAssistContent {
 	private TabLayout tabLayout;
 	private ViewPager2 pager;
@@ -47,7 +49,6 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 	private NotificationsListFragment allNotificationsFragment, mentionsFragment;
 	private String accountID;
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -227,12 +228,17 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		};
 	}
 	@Override
 	public void onProvideAssistContent(AssistContent assistContent) {
 		callFragmentToProvideAssistContent(getFragmentForPage(pager.getCurrentItem()), assistContent);
 	}
 	private class DiscoverPagerAdapter extends RecyclerView.Adapter<SimpleViewHolder>{
 		@NonNull
 		@Override
 		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
 			FrameLayout view=tabViews[viewType];
-			((ViewGroup)view.getParent()).removeView(view);
+			if (view.getParent() != null) ((ViewGroup)view.getParent()).removeView(view);
 			view.setVisibility(View.VISIBLE);
 			view.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 			return new SimpleViewHolder(view);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -10,20 +11,24 @@ import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.requests.notifications.PleromaMarkNotificationsRead;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.AllNotificationsSeenEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Markers;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.AccountCardStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.AccountStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ImageStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
 import org.joinmastodon.android.ui.utils.InsetStatusItemDecoration;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -40,7 +45,6 @@ import java.util.stream.Stream;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.V;
 public class NotificationsListFragment extends BaseStatusListFragment<Notification>{
 	private boolean onlyMentions;
@@ -49,8 +53,8 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	private final DiscoverInfoBannerHelper bannerHelper = new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.POST_NOTIFICATIONS);
 	@Override
-	protected boolean withComposeButton() {
+	protected boolean wantsComposeButton() {
-		return true;
+		return false;
 	}
 	@Override
@@ -84,6 +88,13 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	protected List<StatusDisplayItem> buildDisplayItems(Notification n){
 		Account reportTarget = n.report == null ? null : n.report.targetAccount == null ? null :
 				n.report.targetAccount;
 		Emoji emoji = new Emoji();
 		if(n.emojiUrl!=null){
 			emoji.shortcode=n.emoji.substring(1,n.emoji.length()-1);
 			emoji.url=n.emojiUrl;
 			emoji.staticUrl=n.emojiUrl;
 			emoji.visibleInPicker=false;
 		}
 		String extraText=switch(n.type){
 			case FOLLOW -> getString(R.string.user_followed_you);
 			case FOLLOW_REQUEST -> getString(R.string.user_sent_follow_request);
@@ -94,17 +105,14 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 			case UPDATE -> getString(R.string.sk_post_edited);
 			case SIGN_UP -> getString(R.string.sk_signed_up);
 			case REPORT -> getString(R.string.sk_reported);
 			case REACTION, PLEROMA_EMOJI_REACTION ->
 					n.emoji != null ? getString(R.string.sk_reacted_with, n.emoji) : getString(R.string.sk_reacted);
 		};
-		HeaderStatusDisplayItem titleItem=extraText!=null ? new HeaderStatusDisplayItem(n.id, n.account, n.createdAt, this, accountID, n.status, extraText, n, null) : null;
+		HeaderStatusDisplayItem titleItem=extraText!=null ? new HeaderStatusDisplayItem(n.id, n.account, n.createdAt, this, accountID, n.status, n.emojiUrl!=null ? HtmlParser.parseCustomEmoji(extraText, Collections.singletonList(emoji)) : extraText, n, null) : null;
 		if(n.status!=null){
-			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, titleItem!=null, titleItem==null, n, false, Filter.FilterContext.NOTIFICATIONS, titleItem);
+			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, titleItem!=null, titleItem==null, n, false, Filter.FilterContext.NOTIFICATIONS);
-			if(titleItem!=null){
+			if(titleItem!=null)
-				for(StatusDisplayItem item:items){
+				items.add(0, titleItem);
 					if(item instanceof ImageStatusDisplayItem imgItem){
 						imgItem.horizontalInset=V.dp(32);
 					}
 				}
 			}
 			return items;
 		}else if(titleItem!=null){
 			AccountCardStatusDisplayItem card=new AccountCardStatusDisplayItem(n.id, this,
@@ -125,6 +133,8 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 			knownAccounts.put(s.account.id, s.account);
 		if(s.status!=null && !knownAccounts.containsKey(s.status.account.id))
 			knownAccounts.put(s.status.account.id, s.status.account);
 		if(s.status!=null && s.status.reblog!=null && !knownAccounts.containsKey(s.status.reblog.account.id))
 			knownAccounts.put(s.status.reblog.account.id, s.status.reblog.account);
 	}
 	@Override
@@ -133,7 +143,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 				.getAccount(accountID).getCacheController()
 				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, onlyPosts, refreshing, new SimpleCallback<>(this){
 					@Override
-					public void onSuccess(PaginatedResponse<List<Notification>> result){
+					public void onSuccess(CacheablePaginatedResponse<List<Notification>> result){
 						if (getActivity() == null) return;
 						if(refreshing)
 							relationships.clear();
@@ -145,8 +155,17 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 						loadRelationships(needRelationships);
 						maxID=result.maxID;
-						if(offset==0 && !result.items.isEmpty()){
+						Markers markers = AccountSessionManager.getInstance().getAccount(accountID).markers;
 						if(offset==0 && !result.items.isEmpty() && !result.isFromCache() && markers != null && markers.notifications != null){
 							E.post(new AllNotificationsSeenEvent());
 							new SaveMarkers(null, result.items.get(0).id).exec(accountID);
 							AccountSessionManager.getInstance().getAccount(accountID).markers
 									.notifications.lastReadId = result.items.get(0).id;
 							AccountSessionManager.getInstance().writeAccountsFile();
 							if (isInstanceAkkoma()) {
 								new PleromaMarkNotificationsRead(result.items.get(0).id).exec(accountID);
 							}
 						}
 					}
 				});
@@ -173,30 +192,16 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	@Override
 	public void onItemClick(String id){
 		Notification n=getNotificationByID(id);
-		if(n.status!=null){
+		Bundle args = new Bundle();
-			Status status=n.status;
+		if(n.status != null && n.status.inReplyToAccountId != null && knownAccounts.containsKey(n.status.inReplyToAccountId))
-			Bundle args=new Bundle();
+			args.putParcelable("inReplyToAccount", Parcels.wrap(knownAccounts.get(n.status.inReplyToAccountId)));
-			args.putString("account", accountID);
+		UiUtils.showFragmentForNotification(getContext(), n, accountID, args);
 			args.putParcelable("status", Parcels.wrap(status));
 			if(status.inReplyToAccountId!=null && knownAccounts.containsKey(status.inReplyToAccountId))
 				args.putParcelable("inReplyToAccount", Parcels.wrap(knownAccounts.get(status.inReplyToAccountId)));
 			Nav.go(getActivity(), ThreadFragment.class, args);
 		}else if(n.report != null){
 			String domain = AccountSessionManager.getInstance().getAccount(accountID).domain;
 			UiUtils.launchWebBrowser(getActivity(), "https://"+domain+"/admin/reports/"+n.report.id);
 		}else{
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			args.putParcelable("profileAccount", Parcels.wrap(n.account));
 			Nav.go(getActivity(), ProfileFragment.class, args);
 		}
 	}
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
 		list.addItemDecoration(new InsetStatusItemDecoration(this));
 		if (getParentFragment() instanceof NotificationsFragment) fab.setVisibility(View.GONE);
 		if (onlyPosts) bannerHelper.maybeAddBanner(contentWrap);
 	}
@@ -254,4 +259,11 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		displayItems.subList(index, lastIndex).clear();
 		adapter.notifyItemRangeRemoved(index, lastIndex-index);
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return base.path(isInstanceAkkoma()
 				? "/users/" + getSession().self.username + "/interactions"
 				: "/notifications").build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
@@ -20,7 +20,7 @@ public abstract class PinnableStatusListFragment extends StatusListFragment {
    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        pinnedTimelines = new ArrayList<>(GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.DEFAULT_TIMELINES));
+        pinnedTimelines = new ArrayList<>(GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.getDefaultTimelines(accountID)));
    }
    @Override
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
@@ -337,7 +337,7 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 		public void onSelectedChanged(@Nullable RecyclerView.ViewHolder viewHolder, int actionState){
 			super.onSelectedChanged(viewHolder, actionState);
 			if(actionState==ItemTouchHelper.ACTION_STATE_DRAG){
-				viewHolder.itemView.setTag(R.id.item_touch_helper_previous_elevation, viewHolder.itemView.getElevation()); // prevents the default behavior of changing elevation in onDraw()
+				viewHolder.itemView.setTag(me.grishka.appkit.R.id.item_touch_helper_previous_elevation, viewHolder.itemView.getElevation()); // prevents the default behavior of changing elevation in onDraw()
 				viewHolder.itemView.animate().translationZ(V.dp(1)).setDuration(200).setInterpolator(CubicBezierInterpolator.DEFAULT).start();
 				draggedViewHolder=viewHolder;
 			}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -6,6 +6,7 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.assist.AssistContent;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Color;
@@ -19,13 +20,11 @@ import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ImageSpan;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
@@ -33,7 +32,6 @@ import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
 import android.view.animation.TranslateAnimation;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
@@ -60,6 +58,7 @@ import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.SimpleViewHolder;
@@ -76,6 +75,7 @@ import org.joinmastodon.android.ui.views.CoverImageView;
 import org.joinmastodon.android.ui.views.LinkedTextView;
 import org.joinmastodon.android.ui.views.NestedRecyclerScrollView;
 import org.joinmastodon.android.ui.views.ProgressBarButton;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 import java.time.LocalDateTime;
@@ -93,6 +93,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.viewpager2.widget.ViewPager2;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -112,7 +113,7 @@ import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
-public class ProfileFragment extends LoaderFragment implements OnBackPressedListener, ScrollableToTop{
+public class ProfileFragment extends LoaderFragment implements OnBackPressedListener, ScrollableToTop, HasFab, ProvidesAssistContent.ProvidesWebUri {
 	private static final int AVATAR_RESULT=722;
 	private static final int COVER_RESULT=343;
@@ -139,6 +140,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private Account account;
 	private String accountID;
 	private String domain;
 	private Relationship relationship;
 	private int statusBarHeight;
 	private boolean isOwnProfile;
@@ -152,9 +154,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private WindowInsets childInsets;
 	private PhotoViewer currentPhotoViewer;
 	private boolean editModeLoading;
 	protected int scrollDiff = 0;
-	private static final int MAX_FIELDS=4;
+	private int maxFields = 4;
 	// from ProfileAboutFragment
 	public UsableRecyclerView list;
@@ -175,6 +176,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			setRetainInstance(true);
 		accountID=getArguments().getString("account");
 		domain=AccountSessionManager.getInstance().getAccount(accountID).domain;
 		if(getArguments().containsKey("profileAccount")){
 			account=Parcels.unwrap(getArguments().getParcelable("profileAccount"));
 			profileAccountID=account.id;
@@ -182,6 +184,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			loaded=true;
 			if(!isOwnProfile)
 				loadRelationship();
 			else if (isInstanceAkkoma() && getInstance().isPresent())
 				maxFields = getInstance().get().pleroma.metadata.fieldsLimits.maxFields;
 		}else{
 			profileAccountID=getArguments().getString("profileAccountID");
 			if(!getArguments().getBoolean("noAutoLoad", false))
@@ -327,7 +331,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		username.setOnLongClickListener(v->{
 			String usernameString=account.acct;
 			if(!usernameString.contains("@")){
-				usernameString+="@"+AccountSessionManager.getInstance().getAccount(accountID).domain;
+				usernameString+="@"+domain;
 			}
 			UiUtils.copyText(username, '@'+usernameString);
 			return true;
@@ -439,6 +443,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			toolbarTitleView.setTranslationY(titleTransY);
 			toolbarSubtitleView.setTranslationY(titleTransY);
 		}
 		RecyclerFragment.setRefreshLayoutColors(refreshLayout);
 	}
 	@Override
@@ -512,7 +517,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			ssb.append(account.acct);
 			if(isSelf){
 				ssb.append('@');
-				ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain);
+				ssb.append(domain);
 			}
 			ssb.append(" ");
 			Drawable lock=username.getResources().getDrawable(R.drawable.ic_lock, getActivity().getTheme()).mutate();
@@ -522,7 +527,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			username.setText(ssb);
 		}else{
 			// noinspection SetTextI18n
-			username.setText('@'+account.acct+(isSelf ? ('@'+AccountSessionManager.getInstance().getAccount(accountID).domain) : ""));
+			username.setText('@'+account.acct+(isSelf ? ('@'+domain) : ""));
 		}
 		CharSequence parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
 		if(TextUtils.isEmpty(parsedBio)){
@@ -550,10 +555,12 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		fields.clear();
-		AccountField joined=new AccountField();
+		if (account.createdAt != null) {
-		joined.parsedName=joined.name=getString(R.string.profile_joined);
+			AccountField joined=new AccountField();
-		joined.parsedValue=joined.value=DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).format(LocalDateTime.ofInstant(account.createdAt, ZoneId.systemDefault()));
+			joined.parsedName=joined.name=getString(R.string.profile_joined);
-		fields.add(joined);
+			joined.parsedValue=joined.value=DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).format(LocalDateTime.ofInstant(account.createdAt, ZoneId.systemDefault()));
 			fields.add(joined);
 		}
 		for(AccountField field:account.fields){
 			field.parsedValue=ssb=HtmlParser.parse(field.value, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
@@ -703,7 +710,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				args.putString("profileAccount", profileAccountID);
 				args.putString("profileDisplayUsername", account.getDisplayUsername());
 			}
-			Nav.go(getActivity(), ListTimelinesFragment.class, args);
+			Nav.go(getActivity(), ListsFragment.class, args);
 		}else if(id==R.id.followed_hashtags){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
@@ -758,6 +765,22 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		return fab;
 	}
 	@Override
 	public void showFab() {
 		if (getFragmentForPage(pager.getCurrentItem()) instanceof HasFab fabulous) fabulous.showFab();
 	}
 	@Override
 	public void hideFab() {
 		if (getFragmentForPage(pager.getCurrentItem()) instanceof HasFab fabulous) fabulous.hideFab();
 	}
 	@Override
 	public boolean isScrolling() {
 		return getFragmentForPage(pager.getCurrentItem()) instanceof HasFab fabulous
 				&& fabulous.isScrolling();
 	}
 	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){
 		int topBarsH=getToolbar().getHeight()+statusBarHeight;
 		if(scrollY>avatarBorder.getTop()-topBarsH){
@@ -788,37 +811,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(currentPhotoViewer!=null){
 			currentPhotoViewer.offsetView(0, oldScrollY-scrollY);
 		}
 		if (GlobalUserPreferences.autoHideFab) {
 			int dy = scrollY - oldScrollY;
 			if (dy > 0 && fab.getVisibility() == View.VISIBLE) {
 				TranslateAnimation animate = new TranslateAnimation(
 						0,
 						0,
 						0,
 						fab.getHeight() * 2);
 				animate.setDuration(300);
 				animate.setFillAfter(true);
 				fab.startAnimation(animate);
 				fab.setVisibility(View.INVISIBLE);
 				scrollDiff = 0;
 			} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
 				if (v.getScrollY() == 0 || scrollDiff > 400) {
 					fab.setVisibility(View.VISIBLE);
 					TranslateAnimation animate = new TranslateAnimation(
 							0,
 							0,
 							fab.getHeight() * 2,
 							0);
 					animate.setDuration(300);
 					animate.setFillAfter(true);
 					fab.startAnimation(animate);
 					scrollDiff = 0;
 				} else {
 					scrollDiff += Math.abs(dy);
 				}
 			}
 		}
 	}
 	private Fragment getFragmentForPage(int page){
@@ -1135,7 +1127,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		@Override
 		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
 			FrameLayout view=tabViews[viewType];
-			((ViewGroup)view.getParent()).removeView(view);
+			if (view.getParent() != null) ((ViewGroup)view.getParent()).removeView(view);
 			view.setVisibility(View.VISIBLE);
 			view.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 			return new SimpleViewHolder(view);
@@ -1180,6 +1172,21 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if (adapter != null) adapter.notifyDataSetChanged();
 	}
 	@Override
 	public void onProvideAssistContent(AssistContent assistContent) {
 		callFragmentToProvideAssistContent(getFragmentForPage(pager.getCurrentItem()), assistContent);
 	}
 	@Override
 	public String getAccountID() {
 		return accountID;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return Uri.parse(account.url);
 	}
 	private class MetadataAdapter extends UsableRecyclerView.Adapter<BaseViewHolder> implements ImageLoaderRecyclerAdapter {
 		public MetadataAdapter(){
 			super(imgLoader);
@@ -1210,7 +1217,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		public int getItemCount(){
 			if(isInEditMode){
 				int size=metadataListData.size();
-				if(size<MAX_FIELDS)
+				if(size<maxFields)
 					size++;
 				return size;
 			}
@@ -1327,7 +1334,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		@Override
 		public void onClick(){
 			metadataListData.add(new AccountField());
-			if(metadataListData.size()==MAX_FIELDS){ // replace this row with new row
+			if(metadataListData.size()==maxFields){ // replace this row with new row
 				adapter.notifyItemChanged(metadataListData.size()-1);
 			}else{
 				adapter.notifyItemInserted(metadataListData.size()-1);
@@ -1374,7 +1381,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		public void onSelectedChanged(@Nullable RecyclerView.ViewHolder viewHolder, int actionState){
 			super.onSelectedChanged(viewHolder, actionState);
 			if(actionState==ItemTouchHelper.ACTION_STATE_DRAG){
-				viewHolder.itemView.setTag(R.id.item_touch_helper_previous_elevation, viewHolder.itemView.getElevation()); // prevents the default behavior of changing elevation in onDraw()
+				viewHolder.itemView.setTag(me.grishka.appkit.R.id.item_touch_helper_previous_elevation, viewHolder.itemView.getElevation()); // prevents the default behavior of changing elevation in onDraw()
 				viewHolder.itemView.animate().translationZ(V.dp(1)).setDuration(200).setInterpolator(CubicBezierInterpolator.DEFAULT).start();
 				draggedViewHolder=viewHolder;
 			}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/RecyclerFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/RecyclerFragment.java
@@ -0,0 +1,50 @@
 package org.joinmastodon.android.fragments;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 public abstract class RecyclerFragment<T> extends BaseRecyclerFragment<T> {
 	public RecyclerFragment(int perPage) {
 		super(perPage);
 	}
 	public RecyclerFragment(int layout, int perPage) {
 		super(layout, perPage);
 	}
 	public void onViewCreated(View view, Bundle savedInstanceState) {
 		super.onViewCreated(view, savedInstanceState);
 		if (refreshLayout != null) setRefreshLayoutColors(refreshLayout);
 	}
 	public static void setRefreshLayoutColors(SwipeRefreshLayout l) {
 		List<Integer> colors = new ArrayList<>(Arrays.asList(
 				R.color.primary_600,
 				R.color.red_primary_600,
 				R.color.green_primary_600,
 				R.color.blue_primary_600,
 				R.color.purple_600
 		));
 		int primary = UiUtils.getThemeColorRes(l.getContext(), R.attr.colorPrimary600);
 		if (!colors.contains(primary)) colors.add(0, primary);
 		int offset = colors.indexOf(primary);
 		int[] sorted = new int[colors.size()];
 		for (int i = 0; i < colors.size(); i++) {
 			sorted[i] = colors.get((i + offset) % colors.size());
 		}
 		l.setColorSchemeResources(sorted);
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageButton;
@@ -31,7 +32,7 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 	private static final int SCHEDULED_STATUS_LIST_OPENED = 161;
 	@Override
-	protected boolean withComposeButton() {
+	protected boolean wantsComposeButton() {
 		return true;
 	}
@@ -56,7 +57,7 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 	}
 	@Override
-	protected void onFabClick(View v) {
+	public void onFabClick(View v) {
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		args.putSerializable("scheduledAt", CreateStatus.getDraftInstant());
@@ -64,7 +65,7 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 	}
 	@Override
-	protected boolean onFabLongClick(View v) {
+	public boolean onFabLongClick(View v) {
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		args.putSerializable("scheduledAt", CreateStatus.getDraftInstant());
@@ -79,7 +80,7 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(ScheduledStatus s) {
-		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, null, true);
+		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, null, true, null);
 	}
 	@Override
@@ -96,6 +97,8 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 		args.putString("sourceText", status.text);
 		args.putString("sourceSpoiler", status.spoilerText);
 		args.putBoolean("redraftStatus", true);
 		args.putString("sourceContentType", scheduledStatus.params.contentType != null ?
 				scheduledStatus.params.contentType.name() : null);
 		setResult(true, null);
 		// closing this scheduled status list if another status list is opened from compose fragment
@@ -179,4 +182,10 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 		}
 		return null;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		// TODO: adapt when frontends finally implement a scheduled posts list
 		return null;
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ScrollableToTop.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ScrollableToTop.java
@@ -3,7 +3,8 @@ package org.joinmastodon.android.fragments;
 import android.view.ViewTreeObserver;
 import androidx.recyclerview.widget.RecyclerView;
-import me.grishka.appkit.utils.V;
+
 import org.joinmastodon.android.ui.utils.UiUtils;
 public interface ScrollableToTop{
 	void scrollToTop();
@@ -21,7 +22,7 @@ public interface ScrollableToTop{
 				@Override
 				public boolean onPreDraw(){
 					list.getViewTreeObserver().removeOnPreDrawListener(this);
-					list.scrollBy(0, V.dp(300));
+					list.scrollBy(0, UiUtils.SCROLL_TO_TOP_DELTA);
 					list.smoothScrollToPosition(0);
 					return true;
 				}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -7,13 +7,14 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.LruCache;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -48,6 +49,7 @@ import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
 import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
 import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
 import org.joinmastodon.android.model.PushNotification;
@@ -57,13 +59,16 @@ import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.TextInputFrameLayout;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 import java.util.ArrayList;
 import java.util.Optional;
 import java.util.function.Consumer;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -75,12 +80,13 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
-public class SettingsFragment extends MastodonToolbarFragment{
+public class SettingsFragment extends MastodonToolbarFragment implements ProvidesAssistContent.ProvidesWebUri {
 	private UsableRecyclerView list;
 	private ArrayList<Item> items=new ArrayList<>();
 	private ThemeItem themeItem;
 	private NotificationPolicyItem notificationPolicyItem;
-	private SwitchItem showNewPostsButtonItem, glitchModeItem;
+	private SwitchItem showNewPostsItem, glitchModeItem, compactReblogReplyLineItem;
 	private ButtonItem defaultContentTypeButtonItem;
 	private String accountID;
 	private boolean needUpdateNotificationSettings;
 	private boolean needAppRestart;
@@ -89,7 +95,9 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private ImageView themeTransitionWindowView;
 	private TextItem checkForUpdateItem, clearImageCacheItem;
 	private ImageCache imageCache;
 	private Menu contentTypeMenu;
 	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -99,7 +107,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		imageCache = ImageCache.getInstance(getActivity());
 		accountID=getArguments().getString("account");
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
-		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
+		Optional<Instance> instance = session.getInstance();
 		String instanceName = UiUtils.getInstanceName(accountID);
 		if(GithubSelfUpdater.needSelfUpdating()){
@@ -207,27 +215,47 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.prefixRepliesWithRe=i.checked;
 			GlobalUserPreferences.save();
 		}));
 		items.add(new SwitchItem(R.string.sk_settings_confirm_before_reblog, R.drawable.ic_fluent_checkmark_circle_24_regular, GlobalUserPreferences.confirmBeforeReblog, i->{
 			GlobalUserPreferences.confirmBeforeReblog=i.checked;
 			GlobalUserPreferences.save();
 		}));
 		items.add(new HeaderItem(R.string.sk_timelines));
 		items.add(new SwitchItem(R.string.sk_settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{
 			GlobalUserPreferences.showReplies=i.checked;
 			GlobalUserPreferences.save();
 		}));
 		if (isInstanceAkkoma()) {
 			items.add(new ButtonItem(R.string.sk_settings_reply_visibility, R.drawable.ic_fluent_chat_24_regular, b->{
 				PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
 				popupMenu.inflate(R.menu.reply_visibility);
 				popupMenu.setOnMenuItemClickListener(item -> this.onReplyVisibilityChanged(item, b));
 				b.setOnTouchListener(popupMenu.getDragToOpenListener());
 				b.setOnClickListener(v->popupMenu.show());
 				b.setText(GlobalUserPreferences.replyVisibility == null ?
 						R.string.sk_settings_reply_visibility_all :
 						switch(GlobalUserPreferences.replyVisibility){
 							case "following" -> R.string.sk_settings_reply_visibility_following;
 							case "self" -> R.string.sk_settings_reply_visibility_self;
 							default -> R.string.sk_settings_reply_visibility_all;
 						});
 			}));
 		}
 		items.add(new SwitchItem(R.string.sk_settings_show_boosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, GlobalUserPreferences.showBoosts, i->{
 			GlobalUserPreferences.showBoosts=i.checked;
 			GlobalUserPreferences.save();
 		}));
 		items.add(new SwitchItem(R.string.sk_settings_load_new_posts, R.drawable.ic_fluent_arrow_sync_24_regular, GlobalUserPreferences.loadNewPosts, i->{
 			GlobalUserPreferences.loadNewPosts=i.checked;
-			showNewPostsButtonItem.enabled = i.checked;
+			showNewPostsItem.enabled = i.checked;
 			if (!i.checked) {
 				GlobalUserPreferences.showNewPostsButton = false;
-				showNewPostsButtonItem.checked = false;
+				showNewPostsItem.checked = false;
 			}
-			if (list.findViewHolderForAdapterPosition(items.indexOf(showNewPostsButtonItem)) instanceof SwitchViewHolder svh) svh.rebind();
+			if (list.findViewHolderForAdapterPosition(items.indexOf(showNewPostsItem)) instanceof SwitchViewHolder svh) svh.rebind();
 			GlobalUserPreferences.save();
 		}));
-		items.add(showNewPostsButtonItem = new SwitchItem(R.string.sk_settings_see_new_posts_button, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.showNewPostsButton, i->{
+		items.add(showNewPostsItem = new SwitchItem(R.string.sk_settings_see_new_posts_button, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.showNewPostsButton, i->{
 			GlobalUserPreferences.showNewPostsButton=i.checked;
 			GlobalUserPreferences.save();
 		}));
@@ -253,12 +281,29 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.save();
 			needAppRestart=true;
 		}));
 		items.add(new SwitchItem(R.string.sk_reply_line_above_avatar, R.drawable.ic_fluent_arrow_reply_24_regular, GlobalUserPreferences.replyLineAboveHeader, i->{
 			GlobalUserPreferences.replyLineAboveHeader=i.checked;
 			GlobalUserPreferences.compactReblogReplyLine=i.checked;
 			compactReblogReplyLineItem.enabled=i.checked;
 			compactReblogReplyLineItem.checked= GlobalUserPreferences.replyLineAboveHeader;
 			if (list.findViewHolderForAdapterPosition(items.indexOf(compactReblogReplyLineItem)) instanceof SwitchViewHolder svh) svh.rebind();
 			GlobalUserPreferences.save();
 			needAppRestart=true;
 		}));
 		items.add(compactReblogReplyLineItem=new SwitchItem(R.string.sk_compact_reblog_reply_line, R.drawable.ic_fluent_re_order_24_regular, GlobalUserPreferences.compactReblogReplyLine, i->{
 			GlobalUserPreferences.compactReblogReplyLine=i.checked;
 			GlobalUserPreferences.save();
 			needAppRestart=true;
 		}));
 		compactReblogReplyLineItem.enabled=GlobalUserPreferences.replyLineAboveHeader;
 		items.add(new SwitchItem(R.string.sk_settings_translate_only_opened, R.drawable.ic_fluent_translate_24_regular, GlobalUserPreferences.translateButtonOpenedOnly, i->{
 			GlobalUserPreferences.translateButtonOpenedOnly=i.checked;
 			GlobalUserPreferences.save();
 			needAppRestart=true;
 		}));
-		boolean translationAvailable = instance.v2 != null && instance.v2.configuration.translation != null && instance.v2.configuration.translation.enabled;
+		boolean translationAvailable = instance
 				.map(i -> i.v2 != null && i.v2.configuration.translation != null && i.v2.configuration.translation.enabled)
 				.orElse(false);
 		items.add(new SmallTextItem(getString(translationAvailable ?
 				R.string.sk_settings_translation_availability_note_available :
 				R.string.sk_settings_translation_availability_note_unavailable, instanceName)));
@@ -283,23 +328,55 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new TextItem(R.string.sk_settings_auth, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new HeaderItem(instanceName));
-		items.add(new TextItem(R.string.sk_settings_rules, ()->{
+		items.add(new TextItem(R.string.sk_settings_rules, instance.<Runnable>map(i -> () -> {
-			Bundle args=new Bundle();
+			Bundle args = new Bundle();
-			args.putParcelable("instance", Parcels.wrap(instance));
+			args.putParcelable("instance", Parcels.wrap(i));
 			Nav.go(getActivity(), InstanceRulesFragment.class, args);
-		}, R.drawable.ic_fluent_task_list_ltr_24_regular));
+		}).orElse(null), R.drawable.ic_fluent_task_list_ltr_24_regular));
 		items.add(new TextItem(R.string.sk_settings_about_instance	, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/about"), R.drawable.ic_fluent_info_24_regular));
 		items.add(new TextItem(R.string.settings_tos, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new TextItem(R.string.settings_privacy_policy, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new TextItem(R.string.log_out, this::confirmLogOut, R.drawable.ic_fluent_sign_out_24_regular));
-		if (!TextUtils.isEmpty(instance.version)) items.add(new SmallTextItem(getString(R.string.sk_settings_server_version, instance.version)));
+		items.add(new SmallTextItem(instance
 				.map(i -> getString(R.string.sk_settings_server_version, i.version))
 				.orElse(getString(R.string.sk_instance_info_unavailable))));
 		items.add(new HeaderItem(R.string.sk_instance_features));
 		items.add(new SwitchItem(R.string.sk_settings_content_types, 0, GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID), (i)->{
 			if (i.checked) {
 				GlobalUserPreferences.accountsWithContentTypesEnabled.add(accountID);
 				if (GlobalUserPreferences.accountsDefaultContentTypes.get(accountID) == null) {
 					GlobalUserPreferences.accountsDefaultContentTypes.put(accountID, ContentType.PLAIN);
 				}
 			} else {
 				GlobalUserPreferences.accountsWithContentTypesEnabled.remove(accountID);
 				GlobalUserPreferences.accountsDefaultContentTypes.remove(accountID);
 			}
 			if (list.findViewHolderForAdapterPosition(items.indexOf(defaultContentTypeButtonItem))
 					instanceof ButtonViewHolder bvh) bvh.rebind();
 			GlobalUserPreferences.save();
 		}));
 		items.add(new SmallTextItem(getString(R.string.sk_settings_content_types_explanation)));
 		items.add(defaultContentTypeButtonItem = new ButtonItem(R.string.sk_settings_default_content_type, 0, b->{
 			PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
 			popupMenu.inflate(R.menu.compose_content_type);
 			popupMenu.setOnMenuItemClickListener(item -> this.onContentTypeChanged(item, b));
 			b.setOnTouchListener(popupMenu.getDragToOpenListener());
 			b.setOnClickListener(v->popupMenu.show());
 			ContentType contentType = GlobalUserPreferences.accountsDefaultContentTypes.get(accountID);
 			b.setText(getContentTypeString(contentType));
 			contentTypeMenu = popupMenu.getMenu();
 			contentTypeMenu.findItem(ContentType.getContentTypeRes(contentType)).setChecked(true);
 			instance.ifPresent(i -> ContentType.adaptMenuToInstance(contentTypeMenu, i));
 		}));
 		items.add(new SmallTextItem(getString(R.string.sk_settings_default_content_type_explanation)));
 		items.add(new SwitchItem(R.string.sk_settings_support_local_only, 0, GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID), i->{
 			glitchModeItem.enabled = i.checked;
 			if (i.checked) {
 				GlobalUserPreferences.accountsWithLocalOnlySupport.add(accountID);
-				if (instance.pleroma == null) GlobalUserPreferences.accountsInGlitchMode.add(accountID);
+				if (!isInstanceAkkoma()) {
 					GlobalUserPreferences.accountsInGlitchMode.add(accountID);
 				}
 			} else {
 				GlobalUserPreferences.accountsWithLocalOnlySupport.remove(accountID);
 				GlobalUserPreferences.accountsInGlitchMode.remove(accountID);
@@ -465,6 +542,53 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 	private @StringRes int getContentTypeString(@Nullable ContentType contentType) {
 		if (contentType == null) return R.string.sk_content_type_unspecified;
 		return switch (contentType) {
 			case PLAIN -> R.string.sk_content_type_plain;
 			case HTML -> R.string.sk_content_type_html;
 			case MARKDOWN -> R.string.sk_content_type_markdown;
 			case BBCODE -> R.string.sk_content_type_bbcode;
 			case MISSKEY_MARKDOWN -> R.string.sk_content_type_mfm;
 		};
 	}
 	private boolean onContentTypeChanged(MenuItem item, Button btn){
 		int id = item.getItemId();
 		ContentType contentType = switch (id) {
 			case R.id.content_type_plain -> ContentType.PLAIN;
 			case R.id.content_type_html -> ContentType.HTML;
 			case R.id.content_type_markdown -> ContentType.MARKDOWN;
 			case R.id.content_type_bbcode -> ContentType.BBCODE;
 			case R.id.content_type_misskey_markdown -> ContentType.MISSKEY_MARKDOWN;
 			default -> null;
 		};
 		GlobalUserPreferences.accountsDefaultContentTypes.put(accountID, contentType);
 		GlobalUserPreferences.save();
 		btn.setText(getContentTypeString(contentType));
 		item.setChecked(true);
 		return true;
 	}
 	private boolean onReplyVisibilityChanged(MenuItem item, Button btn){
 		String pref = null;
 		int id = item.getItemId();
 		if (id == R.id.reply_visibility_following) pref = "following";
 		else if (id == R.id.reply_visibility_self) pref = "self";
 		GlobalUserPreferences.replyVisibility=pref;
 		GlobalUserPreferences.save();
 		btn.setText(GlobalUserPreferences.replyVisibility == null ?
 				R.string.sk_settings_reply_visibility_all :
 				switch(GlobalUserPreferences.replyVisibility){
 					case "following" -> R.string.sk_settings_reply_visibility_following;
 					case "self" -> R.string.sk_settings_reply_visibility_self;
 					default -> R.string.sk_settings_reply_visibility_all;
 				});
 		return true;
 	}
 	private void restartActivityToApplyNewTheme(){
 		// Calling activity.recreate() causes a black screen for like half a second.
 		// So, let's take a screenshot and overlay it on top to create the illusion of a smoother transition.
@@ -618,6 +742,16 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return base.path(isInstanceAkkoma() ? "/about" : "/settings").build();
 	}
 	@Override
 	public String getAccountID() {
 		return accountID;
 	}
 	private static abstract class Item{
 		public abstract int getViewType();
 	}
@@ -942,7 +1076,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		private final ImageView icon;
 		private final TextView text;
 		@SuppressLint("ClickableViewAccessibility")
 		public ButtonViewHolder(){
 			super(getActivity(), R.layout.item_settings_button, list);
 			text=findViewById(R.id.text);
@@ -950,10 +1083,17 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			button=findViewById(R.id.button);
 		}
 		@SuppressLint("ClickableViewAccessibility")
 		@Override
 		public void onBind(ButtonItem item){
 			text.setText(item.text);
-			icon.setImageResource(item.icon);
+			icon.setVisibility(item.icon == 0 ? View.GONE : View.VISIBLE);
 			icon.setImageResource(item.icon == 0 ? 0 : item.icon);
 			// reset listeners before letting the button consumer consume the button
 			// (and potentially set some listeners, but not others)
 			button.setOnTouchListener(null);
 			button.setOnClickListener(null);
 			button.setOnLongClickListener(null);
 			item.buttonConsumer.accept(button);
 		}
 	}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java
@@ -1,43 +1,47 @@
 package org.joinmastodon.android.fragments;
-import android.graphics.Canvas;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.SpannableString;
 import android.text.style.ReplacementSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
-import android.widget.LinearLayout;
+import android.widget.Button;
 import android.widget.TextView;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.joinmastodon.android.fragments.onboarding.InstanceCatalogSignupFragment;
 import org.joinmastodon.android.fragments.onboarding.InstanceChooserLoginFragment;
 import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.ui.InterpolatingMotionEffect;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.SizeListenerFrameLayout;
 import org.parceler.Parcels;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager2.widget.ViewPager2;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.AppKitFragment;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.BottomSheet;
 public class SplashFragment extends AppKitFragment{
 	private static final String DEFAULT_SERVER="mastodon.social";
 	private SizeListenerFrameLayout contentView;
 	private View artContainer, blueFill, greenFill;
-	private ViewPager2 pager;
+	private InterpolatingMotionEffect motionEffect;
 	private ViewGroup pagerDots;
 	private View artClouds, artPlaneElephant, artRightHill, artLeftHill, artCenterHill;
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		motionEffect=new InterpolatingMotionEffect(MastodonApp.context);
 	}
 	@Nullable
@@ -46,44 +50,26 @@ public class SplashFragment extends AppKitFragment{
 		contentView=(SizeListenerFrameLayout) inflater.inflate(R.layout.fragment_splash, container, false);
 		contentView.findViewById(R.id.btn_get_started).setOnClickListener(this::onButtonClick);
 		contentView.findViewById(R.id.btn_log_in).setOnClickListener(this::onButtonClick);
 		Button joinDefault=contentView.findViewById(R.id.btn_join_default_server);
 		joinDefault.setText(getString(R.string.join_default_server, DEFAULT_SERVER));
 		joinDefault.setOnClickListener(this::onJoinDefaultServerClick);
 		contentView.findViewById(R.id.btn_learn_more).setOnClickListener(this::onLearnMoreClick);
 		artClouds=contentView.findViewById(R.id.art_clouds);
 		artPlaneElephant=contentView.findViewById(R.id.art_plane_elephant);
 		artRightHill=contentView.findViewById(R.id.art_right_hill);
 		artLeftHill=contentView.findViewById(R.id.art_left_hill);
 		artCenterHill=contentView.findViewById(R.id.art_center_hill);
 		pager=contentView.findViewById(R.id.pager);
 		pagerDots=contentView.findViewById(R.id.pager_dots);
 		pager.setAdapter(new PagerAdapter());
 		pager.setOffscreenPageLimit(3);
 		pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback(){
 			@Override
 			public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels){
 				for(int i=0;i<pagerDots.getChildCount();i++){
 					float alpha;
 					if(i==position){
 						alpha=0.3f+0.7f*(1f-positionOffset);
 					}else if(i==position+1){
 						alpha=0.3f+0.7f*positionOffset;
 					}else{
 						alpha=0.3f;
 					}
 					pagerDots.getChildAt(i).setAlpha(alpha);
 				}
 				float parallaxProgress=(position+positionOffset)/2f;
 				artClouds.setTranslationX(V.dp(-27)*(position>=1 ? 1f : positionOffset));
 				artPlaneElephant.setTranslationX(V.dp(101.55f)*parallaxProgress);
 				artLeftHill.setTranslationX(V.dp(-88)*parallaxProgress);
 				artLeftHill.setTranslationY(V.dp(24)*parallaxProgress);
 				artRightHill.setTranslationX(V.dp(-88)*parallaxProgress);
 				artRightHill.setTranslationY(V.dp(-24)*parallaxProgress);
 				artCenterHill.setTranslationX(V.dp(-40)*parallaxProgress);
 			}
 		});
 		artContainer=contentView.findViewById(R.id.art_container);
 		blueFill=contentView.findViewById(R.id.blue_fill);
 		greenFill=contentView.findViewById(R.id.green_fill);
 		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artClouds, V.dp(-5), V.dp(5), V.dp(-5), V.dp(5)));
 		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artRightHill, V.dp(-15), V.dp(25), V.dp(-10), V.dp(10)));
 		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artLeftHill, V.dp(-25), V.dp(15), V.dp(-15), V.dp(15)));
 		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artCenterHill, V.dp(-14), V.dp(14), V.dp(-5), V.dp(25)));
 		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artPlaneElephant, V.dp(-20), V.dp(12), V.dp(-20), V.dp(12)));
 		artContainer.setOnTouchListener(motionEffect);
 		contentView.setSizeListener(new SizeListenerFrameLayout.OnSizeChangedListener(){
 			@Override
@@ -109,6 +95,38 @@ public class SplashFragment extends AppKitFragment{
 		Nav.go(getActivity(), isSignup ? InstanceCatalogSignupFragment.class : InstanceChooserLoginFragment.class, extras);
 	}
 	private void onJoinDefaultServerClick(View v){
 		new GetInstance()
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Instance result){
 						if(getActivity()==null)
 							return;
 						Bundle args=new Bundle();
 						args.putParcelable("instance", Parcels.wrap(result));
 						Nav.go(getActivity(), InstanceRulesFragment.class, args);
 					}
 					@Override
 					public void onError(ErrorResponse error){
 						if(getActivity()==null)
 							return;
 						error.showToast(getActivity());
 					}
 				})
 				.wrapProgress(getActivity(), R.string.loading_instance, true)
 				.execNoAuth(DEFAULT_SERVER);
 	}
 	private void onLearnMoreClick(View v){
 		View sheetView=getActivity().getLayoutInflater().inflate(R.layout.intro_bottom_sheet, null);
 		BottomSheet sheet=new BottomSheet(getActivity());
 		sheet.setContentView(sheetView);
 		sheet.setNavigationBarBackground(new ColorDrawable(UiUtils.alphaBlendColors(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Surface),
 				UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme());
 		sheet.show();
 	}
 	private void updateArtSize(int w, int h){
 		float scale=w/(float)V.dp(360);
 		artContainer.setScaleX(scale);
@@ -139,60 +157,15 @@ public class SplashFragment extends AppKitFragment{
 		return true;
 	}
-	private class PagerAdapter extends RecyclerView.Adapter<PagerViewHolder>{
+	@Override
-
+	protected void onShown(){
-		@NonNull
+		super.onShown();
-		@Override
+		motionEffect.activate();
 		public PagerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
 			return new PagerViewHolder(viewType);
 		}
 		@Override
 		public void onBindViewHolder(@NonNull PagerViewHolder holder, int position){}
 		@Override
 		public int getItemCount(){
 			return 3;
 		}
 		@Override
 		public int getItemViewType(int position){
 			return position;
 		}
 	}
-	private class PagerViewHolder extends RecyclerView.ViewHolder{
+	@Override
-		public PagerViewHolder(int page){
+	protected void onHidden(){
-			super(new LinearLayout(getActivity()));
+		super.onHidden();
-			LinearLayout ll=(LinearLayout) itemView;
+		motionEffect.deactivate();
 			ll.setOrientation(LinearLayout.VERTICAL);
 			int pad=V.dp(16);
 			ll.setPadding(pad, pad, pad, pad);
 			ll.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 			TextView title=new TextView(getActivity());
 			title.setTextAppearance(R.style.m3_headline_medium);
 			title.setText(switch(page){
 				case 0 -> getString(R.string.welcome_page1_title);
 				case 1 -> getString(R.string.welcome_page2_title);
 				case 2 -> getString(R.string.welcome_page3_title);
 				default -> throw new IllegalStateException("Unexpected value: "+page);
 			});
 			title.setTextColor(0xFF17063B);
 			LinearLayout.LayoutParams lp=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(page==0 ? 46 : 36));
 			lp.bottomMargin=V.dp(page==0 ? 4 : 14);
 			ll.addView(title, lp);
 			TextView text=new TextView(getActivity());
 			text.setTextAppearance(R.style.m3_body_medium);
 			text.setText(switch(page){
 				case 0 -> R.string.welcome_page1_text;
 				case 1 -> R.string.welcome_page2_text;
 				case 2 -> R.string.welcome_page3_text;
 				default -> throw new IllegalStateException("Unexpected value: "+page);
 			});
 			text.setTextColor(0xFF17063B);
 			ll.addView(text, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
 		}
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
@@ -1,11 +1,13 @@
 package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusEditHistory;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
@@ -23,13 +25,13 @@ import java.util.stream.Collectors;
 import me.grishka.appkit.api.SimpleCallback;
 public class StatusEditHistoryFragment extends StatusListFragment{
-	private String id;
+	private String id, url;
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		id=getArguments().getString("id");
 		url=getArguments().getString("url");
 		loadData();
 	}
@@ -55,7 +57,7 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null);
+		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null, null);
 		int idx=data.indexOf(s);
 		if(idx>=0){
 			String date=UiUtils.DATE_TIME_FORMATTER.format(s.createdAt.atZone(ZoneId.systemDefault()));
@@ -156,4 +158,14 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 	public boolean isItemEnabled(String id){
 		return false;
 	}
 	@Override
 	protected Filter.FilterContext getFilterContext() {
 		return null;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return Uri.parse(url);
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments;
 import android.app.assist.AssistContent;
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -28,19 +29,23 @@ import java.util.stream.Stream;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
-public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
+public abstract class StatusListFragment extends BaseStatusListFragment<Status> {
 	protected EventListener eventListener=new EventListener();
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
 		boolean addFooter = !GlobalUserPreferences.spectatorMode ||
 				(this instanceof ThreadFragment t && s.id.equals(t.mainStatus.id));
-		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, addFooter, null, Filter.FilterContext.HOME);
+		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, addFooter, null, getFilterContext());
 	}
 	protected abstract Filter.FilterContext getFilterContext();
 	@Override
 	protected void addAccountToKnown(Status s){
 		if(!knownAccounts.containsKey(s.account.id))
 			knownAccounts.put(s.account.id, s.account);
 		if(s.reblog!=null && !knownAccounts.containsKey(s.reblog.account.id))
 			knownAccounts.put(s.reblog.account.id, s.reblog.account);
 	}
 	@Override
@@ -149,7 +154,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 	protected void onRemoveAccountPostsEvent(RemoveAccountPostsEvent ev){
 		List<Status> toRemove=Stream.concat(data.stream(), preloadedData.stream())
-				.filter(s->s.account.id.equals(ev.postsByAccountID) || (s.reblog!=null && s.reblog.account.id.equals(ev.postsByAccountID)))
+				.filter(s->s.account.id.equals(ev.postsByAccountID) || (!ev.isUnfollow && s.reblog!=null && s.reblog.account.id.equals(ev.postsByAccountID)))
 				.collect(Collectors.toList());
 		for(Status s:toRemove){
 			removeStatus(s);
@@ -178,7 +183,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 	}
 	@Override
-	public void onConfigurationChanged(Configuration newConfig){
+	public void onConfigurationChanged(Configuration newConfig) {
 		super.onConfigurationChanged(newConfig);
 		if (getParentFragment() instanceof HomeTabFragment home) home.updateToolbarLogo();
 	}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
@@ -1,32 +1,54 @@
 package org.joinmastodon.android.fragments;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
 import org.joinmastodon.android.api.requests.statuses.GetStatusContext;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusContext;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.WarningFilteredStatusDisplayItem;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
-public class ThreadFragment extends StatusListFragment{
+public class ThreadFragment extends StatusListFragment implements ProvidesAssistContent {
-	protected Status mainStatus;
+	protected Status mainStatus, updatedStatus;
 	private final HashMap<String, NeighborAncestryInfo> ancestryMap = new HashMap<>();
 	private boolean initialAnimationFinished;
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -43,13 +65,44 @@ public class ThreadFragment extends StatusListFragment{
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
 		List<StatusDisplayItem> items=super.buildDisplayItems(s);
-		if(s.id.equals(mainStatus.id)){
+		// "what the fuck is a deque"? yes
-			for(StatusDisplayItem item:items){
+		// (it's just so the last-added item automatically comes first when looping over it)
 		Deque<Integer> deleteTheseItems = new ArrayDeque<>();
 		// modifying hidden filtered items if status is displayed as a warning
 		List<StatusDisplayItem> itemsToModify =
 				(items.get(0) instanceof WarningFilteredStatusDisplayItem warning)
 						? warning.filteredItems
 						: items;
 		for(int i = 0; i < itemsToModify.size(); i++){
 			StatusDisplayItem item = itemsToModify.get(i);
 			NeighborAncestryInfo ancestryInfo = ancestryMap.get(s.id);
 			if (ancestryInfo != null) {
 				item.setAncestryInfo(
 						ancestryInfo.descendantNeighbor != null,
 						ancestryInfo.ancestoringNeighbor != null,
 						s.id.equals(mainStatus.id),
 						Optional.ofNullable(ancestryInfo.ancestoringNeighbor)
 								.map(ancestor -> ancestor.id.equals(mainStatus.id))
 								.orElse(false)
 				);
 			}
 			if (item instanceof ReblogOrReplyLineStatusDisplayItem &&
 					(!item.isDirectDescendant && item.hasAncestoringNeighbor)) {
 				deleteTheseItems.add(i);
 			}
 			if(s.id.equals(mainStatus.id)){
 				if(item instanceof TextStatusDisplayItem text)
 					text.textSelectable=true;
 				else if(item instanceof FooterStatusDisplayItem footer)
 					footer.hideCounts=true;
 			}
 		}
 		for (int deleteThisItem : deleteTheseItems) itemsToModify.remove(deleteThisItem);
 		if(s.id.equals(mainStatus.id)) {
 			items.add(new ExtendedFooterStatusDisplayItem(s.id, this, s.getContentStatus()));
 		}
 		return items;
@@ -57,19 +110,30 @@ public class ThreadFragment extends StatusListFragment{
 	@Override
 	protected void doLoadData(int offset, int count){
 		refreshMainStatus();
 		currentRequest=new GetStatusContext(mainStatus.id)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(StatusContext result){
-						if (getActivity() == null) return;
+						if (getContext() == null) return;
 						if(refreshing){
 							data.clear();
 							ancestryMap.clear();
 							displayItems.clear();
 							data.add(mainStatus);
 							onAppendItems(Collections.singletonList(mainStatus));
 						}
 						// TODO: figure out how this code works
 						if(isInstanceAkkoma()) sortStatusContext(mainStatus, result);
 						result.descendants=filterStatuses(result.descendants);
 						result.ancestors=filterStatuses(result.ancestors);
 						for (NeighborAncestryInfo i : mapNeighborhoodAncestry(mainStatus, result)) {
 							ancestryMap.put(i.status.id, i);
 						}
 						if(footerProgress!=null)
 							footerProgress.setVisibility(View.GONE);
 						data.addAll(result.descendants);
@@ -78,7 +142,12 @@ public class ThreadFragment extends StatusListFragment{
 						int count=displayItems.size();
 						if(!refreshing)
 							adapter.notifyItemRangeInserted(prevCount, count-prevCount);
-						prependItems(result.ancestors, !refreshing);
+						int prependedCount = prependItems(result.ancestors, !refreshing);
 						if (prependedCount > 0 && displayItems.get(prependedCount) instanceof ReblogOrReplyLineStatusDisplayItem) {
 							displayItems.remove(prependedCount);
 							adapter.notifyItemRemoved(prependedCount);
 							count--;
 						}
 						dataLoaded();
 						if(refreshing){
 							refreshDone();
@@ -90,8 +159,113 @@ public class ThreadFragment extends StatusListFragment{
 				.exec(accountID);
 	}
 	private void refreshMainStatus() {
 		new GetStatusByID(mainStatus.id)
 				.setCallback(new Callback<>() {
 					@Override
 					public void onSuccess(Status status) {
 						if (getContext() == null || status == null) return;
 						updatedStatus = status;
 						// only update main status if the initial animation is already finished.
 						// otherwise, the animator will call it in onAnimationFinished
 						if (initialAnimationFinished || data.size() == 1) updateMainStatus();
 					}
 					@Override
 					public void onError(ErrorResponse error) {}
 				}).exec(accountID);
 	}
 	protected Object updateMainStatus() {
 		// returning fired event object to facilitate testing
 		Object event;
 		if (updatedStatus.editedAt != null &&
 				(mainStatus.editedAt == null ||
 						updatedStatus.editedAt.isAfter(mainStatus.editedAt))) {
 			event = new StatusUpdatedEvent(updatedStatus);
 		} else {
 			event = new StatusCountersUpdatedEvent(updatedStatus);
 		}
 		mainStatus = updatedStatus;
 		updatedStatus = null;
 		E.post(event);
 		return event;
 	}
 	public static List<NeighborAncestryInfo> mapNeighborhoodAncestry(Status mainStatus, StatusContext context) {
 		List<NeighborAncestryInfo> ancestry = new ArrayList<>();
 		List<Status> statuses = new ArrayList<>(context.ancestors);
 		statuses.add(mainStatus);
 		statuses.addAll(context.descendants);
 		int count = statuses.size();
 		for (int index = 0; index < count; index++) {
 			Status current = statuses.get(index);
 			ancestry.add(new NeighborAncestryInfo(
 					current,
 					// descendant neighbor
 					Optional
 							.ofNullable(count > index + 1 ? statuses.get(index + 1) : null)
 							.filter(s -> s.inReplyToId.equals(current.id))
 							.orElse(null),
 					// ancestoring neighbor
 					Optional.ofNullable(index > 0 ? ancestry.get(index - 1) : null)
 							.filter(ancestor -> Optional.ofNullable(ancestor.descendantNeighbor)
 									.map(ancestorsDescendant -> ancestorsDescendant.id.equals(current.id))
 									.orElse(false))
 							.map(a -> a.status)
 							.orElse(null)
 			));
 		}
 		return ancestry;
 	}
 	public static void sortStatusContext(Status mainStatus, StatusContext context) {
 		List<String> threadIds=new ArrayList<>();
 		threadIds.add(mainStatus.id);
 		for(Status s:context.descendants){
 			if(threadIds.contains(s.inReplyToId)){
 				threadIds.add(s.id);
 			}
 		}
 		threadIds.add(mainStatus.inReplyToId);
 		for(int i=context.ancestors.size()-1; i >= 0; i--){
 			Status s=context.ancestors.get(i);
 			if(s.inReplyToId != null && threadIds.contains(s.id)){
 				threadIds.add(s.inReplyToId);
 			}
 		}
 		context.ancestors=context.ancestors.stream().filter(s -> threadIds.contains(s.id)).collect(Collectors.toList());
 		context.descendants=getDescendantsOrdered(mainStatus.id,
 				context.descendants.stream()
 						.filter(s -> threadIds.contains(s.id))
 						.collect(Collectors.toList()));
 	}
 	private static List<Status> getDescendantsOrdered(String id, List<Status> statuses){
 		List<Status> out=new ArrayList<>();
 		for(Status s:getDirectDescendants(id, statuses)){
 			out.add(s);
 			getDirectDescendants(s.id, statuses).forEach(d ->{
 				out.add(d);
 				out.addAll(getDescendantsOrdered(d.id, statuses));
 			});
 		}
 		return out;
 	}
 	private static List<Status> getDirectDescendants(String id, List<Status> statuses){
 		return statuses.stream()
 				.filter(s -> s.inReplyToId.equals(id))
 				.collect(Collectors.toList());
 	}
 	private List<Status> filterStatuses(List<Status> statuses){
-		StatusFilterPredicate statusFilterPredicate=new StatusFilterPredicate(accountID,Filter.FilterContext.THREAD);
+		StatusFilterPredicate statusFilterPredicate=new StatusFilterPredicate(accountID,getFilterContext());
 		return statuses.stream()
 				.filter(statusFilterPredicate)
 				.collect(Collectors.toList());
@@ -113,10 +287,22 @@ public class ThreadFragment extends StatusListFragment{
 		showContent();
 		if(!loaded)
 			footerProgress.setVisibility(View.VISIBLE);
 		list.setItemAnimator(new BetterItemAnimator() {
 			@Override
 			public void onAnimationFinished(@NonNull RecyclerView.ViewHolder viewHolder) {
 				super.onAnimationFinished(viewHolder);
 				// in case someone else is about to call updateMainStatus faster...
 				initialAnimationFinished = true;
 				// ...if not (someone did fetch it but the animation wasn't finished yet),
 				// call it now
 				if (updatedStatus != null) updateMainStatus();
 			}
 		});
 	}
 	protected void onStatusCreated(StatusCreatedEvent ev){
 		if(ev.status.inReplyToId!=null && getStatusByID(ev.status.inReplyToId)!=null){
 			data.add(ev.status);
 			onAppendItems(Collections.singletonList(ev.status));
 		}
 	}
@@ -135,4 +321,40 @@ public class ThreadFragment extends StatusListFragment{
 	public boolean wantsLightNavigationBar(){
 		return !UiUtils.isDarkTheme();
 	}
 	@Override
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.THREAD;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return Uri.parse(mainStatus.url);
 	}
 	protected static class NeighborAncestryInfo {
 		protected Status status, descendantNeighbor, ancestoringNeighbor;
 		protected NeighborAncestryInfo(@NonNull Status status, Status descendantNeighbor, Status ancestoringNeighbor) {
 			this.status = status;
 			this.descendantNeighbor = descendantNeighbor;
 			this.ancestoringNeighbor = ancestoringNeighbor;
 		}
 		@Override
 		public boolean equals(Object o) {
 			if (this == o) return true;
 			if (o == null || getClass() != o.getClass()) return false;
 			NeighborAncestryInfo that = (NeighborAncestryInfo) o;
 			return status.equals(that.status)
 					&& Objects.equals(descendantNeighbor, that.descendantNeighbor)
 					&& Objects.equals(ancestoringNeighbor, that.ancestoringNeighbor);
 		}
 		@Override
 		public int hashCode() {
 			return Objects.hash(status, descendantNeighbor, ancestoringNeighbor);
 		}
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AccountRelatedAccountListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/AccountRelatedAccountListFragment.java
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.account_list;
 import android.net.Uri;
 import android.os.Bundle;
 import org.joinmastodon.android.model.Account;
@@ -14,4 +15,11 @@ public abstract class AccountRelatedAccountListFragment extends PaginatedAccount
 		account=Parcels.unwrap(getArguments().getParcelable("targetAccount"));
 		setTitle("@"+account.acct);
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return base.path(isInstanceAkkoma()
 				? "/users/" + account.id
 				: '@' + account.acct).build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments.account_list;
 import android.app.ProgressDialog;
 import android.app.assist.AssistContent;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.drawable.Animatable;
@@ -23,8 +24,10 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.ListTimelinesFragment;
+import org.joinmastodon.android.fragments.HasAccountID;
 import org.joinmastodon.android.fragments.ListsFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Relationship;
@@ -33,6 +36,7 @@ import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 import java.util.ArrayList;
@@ -48,7 +52,6 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.APIRequest;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -57,7 +60,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
-public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseAccountListFragment.AccountItem>{
+public abstract class BaseAccountListFragment extends RecyclerFragment<BaseAccountListFragment.AccountItem> implements ProvidesAssistContent.ProvidesWebUri {
 	protected HashMap<String, Relationship> relationships=new HashMap<>();
 	protected String accountID;
 	protected ArrayList<APIRequest<?>> relationshipsRequests=new ArrayList<>();
@@ -170,6 +173,16 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 		super.onApplyWindowInsets(insets);
 	}
 	@Override
 	public String getAccountID() {
 		return accountID;
 	}
 	@Override
 	public void onProvideAssistContent(AssistContent assistContent) {
 		assistContent.setWebUri(getWebUri(getSession().getInstanceUri().buildUpon()));
 	}
 	protected class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
 		public AccountsAdapter(){
 			super(imgLoader);
@@ -295,7 +308,6 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
 			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
 			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername())).setVisible(relationship.following);
 			menu.findItem(R.id.soft_block).setVisible(relationship.followedBy && !relationship.following);
 			MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
 			MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
@@ -309,7 +321,7 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 				manageUserLists.setVisible(true);
 			}else{
 				hideBoosts.setVisible(false);
-				manageUserLists.setVisible(true);
+				manageUserLists.setVisible(false);
 			}
 			menu.findItem(R.id.block_domain).setVisible(false);
@@ -388,7 +400,7 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 				args.putString("account", accountID);
 				args.putString("profileAccount", account.id);
 				args.putString("profileDisplayUsername", account.getDisplayUsername());
-				Nav.go(getActivity(), ListTimelinesFragment.class, args);
+				Nav.go(getActivity(), ListsFragment.class, args);
 			}
 			return true;
 		}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.account_list;
 import android.net.Uri;
 import android.os.Bundle;
 import org.joinmastodon.android.R;
@@ -19,4 +20,10 @@ public class FollowerListFragment extends AccountRelatedAccountListFragment{
 	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
 		return new GetAccountFollowers(account.id, maxID, count);
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return super.getWebUri(base).buildUpon()
 				.appendPath(isInstanceAkkoma() ? "#followers" : "/followers").build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.account_list;
 import android.net.Uri;
 import android.os.Bundle;
 import org.joinmastodon.android.R;
@@ -19,4 +20,10 @@ public class FollowingListFragment extends AccountRelatedAccountListFragment{
 	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
 		return new GetAccountFollowing(account.id, maxID, count);
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return super.getWebUri(base).buildUpon()
 				.appendPath(isInstanceAkkoma() ? "#followees" : "/following").build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.account_list;
 import android.net.Uri;
 import android.os.Bundle;
 import org.joinmastodon.android.R;
@@ -18,4 +19,12 @@ public class StatusFavoritesListFragment extends StatusRelatedAccountListFragmen
 	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
 		return new GetStatusFavorites(status.id, maxID, count);
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		Uri statusUri = super.getWebUri(base);
 		return isInstanceAkkoma()
 				? statusUri
 				: statusUri.buildUpon().appendPath("favourites").build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.account_list;
 import android.net.Uri;
 import android.os.Bundle;
 import org.joinmastodon.android.R;
@@ -18,4 +19,12 @@ public class StatusReblogsListFragment extends StatusRelatedAccountListFragment{
 	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
 		return new GetStatusReblogs(status.id, maxID, count);
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		Uri statusUri = super.getWebUri(base);
 		return isInstanceAkkoma()
 				? statusUri
 				: statusUri.buildUpon().appendPath("reblogs").build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusRelatedAccountListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusRelatedAccountListFragment.java
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.account_list;
 import android.net.Uri;
 import android.os.Bundle;
 import org.joinmastodon.android.model.Status;
@@ -18,4 +19,13 @@ public abstract class StatusRelatedAccountListFragment extends PaginatedAccountL
 	protected boolean hasSubtitle(){
 		return false;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return base
 				.encodedPath(isInstanceAkkoma()
 						? "/notice/" + status.id
 						: '@' + status.account.acct + '/' + status.id)
 				.build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/BubbleTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/BubbleTimelineFragment.java
@@ -0,0 +1,61 @@
 package org.joinmastodon.android.fragments.discover;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import org.joinmastodon.android.api.requests.timelines.GetBubbleTimeline;
 import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
 import java.util.List;
 import java.util.stream.Collectors;
 import me.grishka.appkit.api.SimpleCallback;
 public class BubbleTimelineFragment extends StatusListFragment {
    private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.BUBBLE_TIMELINE);
    private String maxID;
    @Override
    protected boolean wantsComposeButton() {
        return true;
    }
    @Override
    protected void doLoadData(int offset, int count){
        currentRequest=new GetBubbleTimeline(refreshing ? null : maxID, count)
                .setCallback(new SimpleCallback<>(this){
                    @Override
                    public void onSuccess(List<Status> result){
                        if(!result.isEmpty())
                            maxID=result.get(result.size()-1).id;
                        if (getActivity() == null) return;
                        result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
                        onDataLoaded(result, !result.isEmpty());
                    }
                })
                .exec(accountID);
    }
    @Override
    public void onViewCreated(View view, Bundle savedInstanceState){
        super.onViewCreated(view, savedInstanceState);
        bannerHelper.maybeAddBanner(contentWrap);
    }
    @Override
    protected Filter.FilterContext getFilterContext() {
        return Filter.FilterContext.PUBLIC;
    }
    @Override
    public Uri getWebUri(Uri.Builder base) {
        return isInstanceAkkoma() ? base.path("/main/bubble").build() : null;
    }
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
@@ -3,6 +3,7 @@ package org.joinmastodon.android.fragments.discover;
 import android.graphics.Rect;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -17,6 +18,7 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetFollowSuggestions;
 import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.FollowSuggestion;
@@ -26,6 +28,7 @@ import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ProgressBarButton;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 import java.util.Collections;
@@ -40,7 +43,6 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -49,7 +51,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
-public class DiscoverAccountsFragment extends BaseRecyclerFragment<DiscoverAccountsFragment.AccountWrapper> implements ScrollableToTop, IsOnTop {
+public class DiscoverAccountsFragment extends RecyclerFragment<DiscoverAccountsFragment.AccountWrapper> implements ScrollableToTop, IsOnTop, ProvidesAssistContent.ProvidesWebUri {
 	private String accountID;
 	private Map<String, Relationship> relationships=Collections.emptyMap();
 	private GetAccountRelationships relationshipsRequest;
@@ -145,6 +147,16 @@ public class DiscoverAccountsFragment extends BaseRecyclerFragment<DiscoverAccou
 		return isRecyclerViewOnTop(list);
 	}
 	@Override
 	public String getAccountID() {
 		return accountID;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return isInstanceAkkoma() ? null : base.path("/explore/suggestions").build();
 	}
 	private class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
 		public AccountsAdapter(){
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments.discover;
 import android.app.Fragment;
 import android.app.assist.AssistContent;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
@@ -19,12 +20,14 @@ import android.widget.TextView;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -36,7 +39,7 @@ import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.utils.V;
-public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, OnBackPressedListener, IsOnTop {
+public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, OnBackPressedListener, IsOnTop, ProvidesAssistContent {
 	private TabLayout tabLayout;
 	private ViewPager2 pager;
@@ -49,7 +52,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	private ProgressBar searchProgress;
 	private DiscoverPostsFragment postsFragment;
-	private TrendingHashtagsFragment hashtagsFragment;
+	private DiscoverHashtagsFragment hashtagsFragment;
 	private DiscoverNewsFragment newsFragment;
 	private DiscoverAccountsFragment accountsFragment;
 	private SearchFragment searchFragment;
@@ -117,7 +120,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			postsFragment=new DiscoverPostsFragment();
 			postsFragment.setArguments(args);
-			hashtagsFragment=new TrendingHashtagsFragment();
+			hashtagsFragment=new DiscoverHashtagsFragment();
 			hashtagsFragment.setArguments(args);
 			newsFragment=new DiscoverNewsFragment();
@@ -238,7 +241,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		else scrollToTop();
 	}
-	private void selectSearch() {
+	public void selectSearch() {
 		searchEdit.requestFocus();
 		onSearchEditFocusChanged(searchEdit, true);
 		getActivity().getSystemService(InputMethodManager.class).showSoftInput(searchEdit, 0);
@@ -272,6 +275,8 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		searchBack.setEnabled(false);
 		searchBack.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
 		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(searchEdit.getWindowToken(), 0);
 		if (getArguments().getBoolean("disableDiscover"))
 			((HomeFragment) getParentFragment()).onBackPressed();
 	}
 	@Override
@@ -318,6 +323,13 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			V.setVisibilityAnimated(searchClear, visible ? View.INVISIBLE : View.VISIBLE);
 	}
 	@Override
 	public void onProvideAssistContent(AssistContent assistContent) {
 		callFragmentToProvideAssistContent(searchActive
 				? searchFragment
 				: getFragmentForPage(pager.getCurrentItem()), assistContent);
 	}
 	private class DiscoverPagerAdapter extends RecyclerView.Adapter<SimpleViewHolder>{
 		@NonNull
 		@Override
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverHashtagsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverHashtagsFragment.java
@@ -1,5 +1,9 @@
 package org.joinmastodon.android.fragments.discover;
 import static org.joinmastodon.android.ui.displayitems.HashtagStatusDisplayItem.Holder.withHistoryParams;
 import static org.joinmastodon.android.ui.displayitems.HashtagStatusDisplayItem.Holder.withoutHistoryParams;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
@@ -8,27 +12,28 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.trends.GetTrendingHashtags;
 import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.HashtagChartView;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import java.util.List;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
-public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> implements ScrollableToTop, IsOnTop {
+public class DiscoverHashtagsFragment extends RecyclerFragment<Hashtag> implements ScrollableToTop, IsOnTop, ProvidesAssistContent.ProvidesWebUri {
 	private String accountID;
 	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_HASHTAGS);
-	public TrendingHashtagsFragment(){
+	public DiscoverHashtagsFragment(){
 		super(10);
 	}
@@ -73,6 +78,16 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
 		return isRecyclerViewOnTop(list);
 	}
 	@Override
 	public String getAccountID() {
 		return accountID;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return isInstanceAkkoma() ? null : base.path("/explore/tags").build();
 	}
 	private class HashtagsAdapter extends RecyclerView.Adapter<HashtagViewHolder>{
 		@NonNull
 		@Override
@@ -105,6 +120,14 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
 		@Override
 		public void onBind(Hashtag item){
 			title.setText('#'+item.name);
 			if (item.history == null || item.history.isEmpty()) {
 				subtitle.setText(null);
 				chart.setVisibility(View.GONE);
 				title.setLayoutParams(withoutHistoryParams);
 				return;
 			}
 			chart.setVisibility(View.VISIBLE);
 			title.setLayoutParams(withHistoryParams);
 			int numPeople=item.history.get(0).accounts;
 			if(item.history.size()>1)
 				numPeople+=item.history.get(1).accounts;
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments.discover;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -11,6 +12,7 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.trends.GetTrendingLinks;
 import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Card;
 import org.joinmastodon.android.ui.DividerItemDecoration;
@@ -18,6 +20,7 @@ import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.drawables.BlurhashCrossfadeDrawable;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import java.util.Collections;
 import java.util.List;
@@ -26,7 +29,6 @@ import java.util.stream.Collectors;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -35,7 +37,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
-public class DiscoverNewsFragment extends BaseRecyclerFragment<Card> implements ScrollableToTop, IsOnTop {
+public class DiscoverNewsFragment extends RecyclerFragment<Card> implements ScrollableToTop, IsOnTop, ProvidesAssistContent.ProvidesWebUri {
 	private String accountID;
 	private List<ImageLoaderRequest> imageRequests=Collections.emptyList();
 	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_LINKS);
@@ -88,6 +90,16 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment<Card> implements
 		return isRecyclerViewOnTop(list);
 	}
 	@Override
 	public String getAccountID() {
 		return accountID;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return isInstanceAkkoma() ? null : base.path("/explore/links").build();
 	}
 	private class LinksAdapter extends UsableRecyclerView.Adapter<LinkViewHolder> implements ImageLoaderRecyclerAdapter{
 		public LinksAdapter(){
 			super(imgLoader);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.discover;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
@@ -26,7 +27,7 @@ public class DiscoverPostsFragment extends StatusListFragment implements IsOnTop
 					@Override
 					public void onSuccess(List<Status> result){
 						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
+						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				}).exec(accountID);
@@ -42,4 +43,14 @@ public class DiscoverPostsFragment extends StatusListFragment implements IsOnTop
 	public boolean isOnTop() {
 		return isRecyclerViewOnTop(list);
 	}
 	@Override
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.PUBLIC;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return isInstanceAkkoma() ? null : base.path("/explore/posts").build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.discover;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
@@ -21,11 +22,10 @@ public class FederatedTimelineFragment extends StatusListFragment {
 	private String maxID;
 	@Override
-	protected boolean withComposeButton() {
+	protected boolean wantsComposeButton() {
 		return true;
 	}
 	@Override
 	protected void doLoadData(int offset, int count){
 		currentRequest=new GetPublicTimeline(false, false, refreshing ? null : maxID, count)
@@ -35,7 +35,7 @@ public class FederatedTimelineFragment extends StatusListFragment {
 						if(!result.isEmpty())
 							maxID=result.get(result.size()-1).id;
 						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
+						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -47,4 +47,14 @@ public class FederatedTimelineFragment extends StatusListFragment {
 		super.onViewCreated(view, savedInstanceState);
 		bannerHelper.maybeAddBanner(contentWrap);
 	}
 	@Override
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.PUBLIC;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return base.path(isInstanceAkkoma() ? "/main/all" : "/public").build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
@@ -1,9 +1,11 @@
 package org.joinmastodon.android.fragments.discover;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
@@ -20,11 +22,10 @@ public class LocalTimelineFragment extends StatusListFragment {
 	private String maxID;
 	@Override
-	protected boolean withComposeButton() {
+	protected boolean wantsComposeButton() {
 		return true;
 	}
 	@Override
 	protected void doLoadData(int offset, int count){
 		currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, count)
@@ -34,7 +35,7 @@ public class LocalTimelineFragment extends StatusListFragment {
 						if(!result.isEmpty())
 							maxID=result.get(result.size()-1).id;
 						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
+						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -46,4 +47,14 @@ public class LocalTimelineFragment extends StatusListFragment {
 		super.onViewCreated(view, savedInstanceState);
 		bannerHelper.maybeAddBanner(contentWrap);
 	}
 	@Override
 	protected Filter.FilterContext getFilterContext() {
 		return Filter.FilterContext.PUBLIC;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		return base.path(isInstanceAkkoma() ? "/main/public" : "/public/local").build();
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments.discover;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -15,6 +16,7 @@ import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.SearchResults;
@@ -80,7 +82,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult> impleme
 		return switch(s.type){
 			case ACCOUNT -> Collections.singletonList(new AccountStatusDisplayItem(s.id, this, s.account));
 			case HASHTAG -> Collections.singletonList(new HashtagStatusDisplayItem(s.id, this, s.hashtag));
-			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true, null);
+			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true, null, Filter.FilterContext.PUBLIC);
 		};
 	}
@@ -247,7 +249,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult> impleme
 	}
 	public void setQuery(String q){
-		if(Objects.equals(q, currentQuery))
+		if(Objects.equals(q, currentQuery) || q.isBlank())
 			return;
 		if(currentRequest!=null){
 			currentRequest.cancel();
@@ -315,6 +317,14 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult> impleme
 		return isRecyclerViewOnTop(list);
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		Uri.Builder searchUri = base.path("/search");
 		return isInstanceAkkoma()
 				? searchUri.appendQueryParameter("query", currentQuery).build()
 				: searchUri.build();
 	}
 	@FunctionalInterface
 	public interface ProgressVisibilityListener{
 		void onProgressVisibilityChanged(boolean visible);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
@@ -89,13 +89,6 @@ public class AccountActivationFragment extends ToolbarFragment{
 		return !UiUtils.isDarkTheme();
 	}
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
 		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
 		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
 	}
 	@Override
 	protected void onUpdateToolbar(){
 		super.onUpdateToolbar();
@@ -110,7 +103,7 @@ public class AccountActivationFragment extends ToolbarFragment{
 	@Override
 	public void onToolbarNavigationClick(){
-		new AccountSwitcherSheet(getActivity()).show();
+		new AccountSwitcherSheet(getActivity(), null).show();
 	}
 	@Override
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
@@ -124,6 +124,7 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 		super.onViewCreated(view, savedInstanceState);
 		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorWindowBackground));
 		list.setItemAnimator(new BetterItemAnimator());
 		((UsableRecyclerView) list).setSelector(null);
 	}
 	@Override
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java
@@ -17,6 +17,7 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.MastodonErrorResponse;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.catalog.CatalogInstance;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
@@ -44,7 +45,6 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.V;
@@ -52,7 +52,7 @@ import okhttp3.Call;
 import okhttp3.Request;
 import okhttp3.Response;
-abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstance>{
+abstract class InstanceCatalogFragment extends RecyclerFragment<CatalogInstance> {
 	protected RecyclerView.Adapter adapter;
 	protected MergeRecyclerAdapter mergeAdapter;
 	protected CatalogInstance chosenInstance;
@@ -75,7 +75,7 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 	private static final double DUNBAR=Math.log(800);
 	public InstanceCatalogFragment(int layout, int perPage){
-		super(layout, perPage);
+	super(layout, perPage);
 	}
 	@Override
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
@@ -2,7 +2,9 @@ package org.joinmastodon.android.fragments.onboarding;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.assist.AssistContent;
 import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Html;
@@ -24,6 +26,7 @@ import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ElevationOnScrollListener;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 import androidx.annotation.NonNull;
@@ -38,7 +41,7 @@ import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 import me.grishka.appkit.views.UsableRecyclerView;
-public class InstanceRulesFragment extends ToolbarFragment{
+public class InstanceRulesFragment extends ToolbarFragment implements ProvidesAssistContent {
 	private UsableRecyclerView list;
 	private MergeRecyclerAdapter adapter;
 	private Button btn;
@@ -130,6 +133,15 @@ public class InstanceRulesFragment extends ToolbarFragment{
 		}
 	}
 	@Override
 	public void onProvideAssistContent(AssistContent assistContent) {
 		assistContent.setWebUri(new Uri.Builder()
 				.scheme("https")
 				.authority(instance.normalizedUri)
 				.path("/about")
 				.build());
 	}
 	private class ItemsAdapter extends RecyclerView.Adapter<ItemViewHolder>{
 		@NonNull
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java
@@ -21,6 +21,7 @@ import org.joinmastodon.android.api.requests.accounts.GetFollowSuggestions;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.model.FollowSuggestion;
 import org.joinmastodon.android.model.ParsedAccount;
 import org.joinmastodon.android.model.Relationship;
@@ -43,7 +44,6 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -52,7 +52,7 @@ import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 import me.grishka.appkit.views.UsableRecyclerView;
-public class OnboardingFollowSuggestionsFragment extends BaseRecyclerFragment<ParsedAccount>{
+public class OnboardingFollowSuggestionsFragment extends RecyclerFragment<ParsedAccount> {
 	private String accountID;
 	private Map<String, Relationship> relationships=Collections.emptyMap();
 	private GetAccountRelationships relationshipsRequest;
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java
@@ -5,6 +5,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.SparseIntArray;
@@ -21,11 +22,10 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.events.FinishReportFragmentsEvent;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.displayitems.AudioStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ImageStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.LinkCardStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
@@ -132,22 +132,7 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 				if(holder.getAbsoluteAdapterPosition()==0)
 					return;
 				outRect.left=V.dp(40);
-				if(holder instanceof ImageStatusDisplayItem.Holder<?> imgHolder){
+				if(holder instanceof AudioStatusDisplayItem.Holder){
 					PhotoLayoutHelper.TiledLayoutResult layout=imgHolder.getItem().tiledLayout;
 					PhotoLayoutHelper.TiledLayoutResult.Tile tile=imgHolder.getItem().thisTile;
 					String siblingID;
 					if(holder.getAbsoluteAdapterPosition()<parent.getAdapter().getItemCount()-1){
 						siblingID=displayItems.get(holder.getAbsoluteAdapterPosition()-getMainAdapterOffset()+1).parentID;
 					}else{
 						siblingID=null;
 					}
 					if(tile.startCol>0)
 						outRect.left=0;
 					outRect.left+=V.dp(16);
 					outRect.right=V.dp(16);
 					if(!imgHolder.getItemID().equals(siblingID) || tile.startRow+tile.rowSpan==layout.rowSizes.length)
 						outRect.bottom=V.dp(16);
 				}else if(holder instanceof AudioStatusDisplayItem.Holder){
 					outRect.bottom=V.dp(16);
 				}else if(holder instanceof LinkCardStatusDisplayItem.Holder){
 					outRect.bottom=V.dp(16);
@@ -166,10 +151,6 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 						parent.getDecoratedBoundsWithMargins(child, tmpRect);
 						String id=sdiHolder.getItemID();
 						int height=tmpRect.height();
 						if(holder instanceof ImageStatusDisplayItem.Holder<?> imgHolder){
 							if(imgHolder.getItem().thisTile.startCol+imgHolder.getItem().thisTile.colSpan<imgHolder.getItem().tiledLayout.columnSizes.length)
 								height=0;
 						}
 						if(!(holder instanceof HeaderStatusDisplayItem.Holder) && !(holder instanceof ReblogOrReplyLineStatusDisplayItem.Holder))
 							postsWithKnownNonHeaderHeights.add(id);
 						knownDisplayItemHeights.put(holder.getAbsoluteAdapterPosition(), height);
@@ -236,17 +217,6 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 		return adapter;
 	}
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
 		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null);
 		for(StatusDisplayItem item:items){
 			if(item instanceof ImageStatusDisplayItem isdi){
 				isdi.horizontalInset=V.dp(40+32);
 			}
 		}
 		return items;
 	}
 	protected void drawDivider(View child, View bottomSibling, RecyclerView.ViewHolder holder, RecyclerView.ViewHolder siblingHolder, RecyclerView parent, Canvas c, Paint paint){
 		parent.getDecoratedBoundsWithMargins(child, tmpRect);
 		tmpRect.offset(0, Math.round(child.getTranslationY()));
@@ -293,4 +263,16 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 	protected boolean wantsOverlaySystemNavigation(){
 		return false;
 	}
 	@Override
 	protected Filter.FilterContext getFilterContext() {
 		return null;
 	}
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		if (reportStatus != null) return Uri.parse(reportStatus.url);
 		if (reportAccount != null) return Uri.parse(reportAccount.url);
 		return null;
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Account.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Account.java
@@ -43,7 +43,7 @@ public class Account extends BaseModel implements Searchable{
 	/**
 	 * The profile's display name.
 	 */
-	@RequiredField
+//	@RequiredField
 	public String displayName;
 	/**
 	 * The profile's bio / description.
@@ -86,7 +86,7 @@ public class Account extends BaseModel implements Searchable{
 	/**
 	 * When the account was created.
 	 */
-	@RequiredField
+//	@RequiredField
 	public Instant createdAt;
 	/**
 	 * When the most recent status was posted.
--- a/mastodon/src/main/java/org/joinmastodon/android/model/ContentType.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/ContentType.java
@@ -0,0 +1,40 @@
 package org.joinmastodon.android.model;
 import android.view.Menu;
 import androidx.annotation.Nullable;
 import com.google.gson.annotations.SerializedName;
 import org.joinmastodon.android.R;
 public enum ContentType {
 	@SerializedName("text/plain")
 	PLAIN,
 	@SerializedName("text/html")
 	HTML,
 	@SerializedName("text/markdown")
 	MARKDOWN,
 	@SerializedName("text/bbcode")
 	BBCODE, // akkoma
 	@SerializedName("text/x.misskeymarkdown")
 	MISSKEY_MARKDOWN; // akkoma/*key
 	public static int getContentTypeRes(@Nullable ContentType contentType) {
 		return contentType == null ? R.id.content_type_null : switch(contentType) {
 			case PLAIN -> R.id.content_type_plain;
 			case HTML -> R.id.content_type_html;
 			case MARKDOWN -> R.id.content_type_markdown;
 			case BBCODE -> R.id.content_type_bbcode;
 			case MISSKEY_MARKDOWN -> R.id.content_type_misskey_markdown;
 		};
 	}
 	public static void adaptMenuToInstance(Menu m, Instance i) {
 		if (i.pleroma == null) {
 			// memo: change this if glitch or another mastodon fork supports bbcode or mfm
 			m.findItem(R.id.content_type_bbcode).setVisible(false);
 			m.findItem(R.id.content_type_misskey_markdown).setVisible(false);
 		}
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Filter.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Filter.java
@@ -2,22 +2,22 @@ package org.joinmastodon.android.model;
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import com.google.gson.annotations.SerializedName;
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.RequiredField;
 import org.parceler.Parcel;
 import java.time.Instant;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
@Parcel
 public class Filter extends BaseModel{
 	@RequiredField
 	public String id;
 	@RequiredField
 	public String phrase;
 	public String title;
 	public transient EnumSet<FilterContext> context=EnumSet.noneOf(FilterContext.class);
--- a/mastodon/src/main/java/org/joinmastodon/android/model/FilterResult.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/FilterResult.java
@@ -1,8 +1,15 @@
 package org.joinmastodon.android.model;
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.parceler.Parcel;
@Parcel
 public class FilterResult extends BaseModel {
    public Filter filter;
    @Override
    public void postprocess() throws ObjectValidationException {
        super.postprocess();
        if (filter != null) filter.postprocess();
    }
 }
--- a/Show More
+++ b/Show More