diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
index 11cdf7e0b..cb91616c0 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -147,7 +147,6 @@ public class GlobalUserPreferences{
 		uniformNotificationIcon=prefs.getBoolean("uniformNotificationIcon", false);
 		showDividers =prefs.getBoolean("showDividers", false);
 		relocatePublishButton=prefs.getBoolean("relocatePublishButton", true);
-		compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true);
 		defaultToUnlistedReplies=prefs.getBoolean("defaultToUnlistedReplies", false);
 		doubleTapToSearch =prefs.getBoolean("doubleTapToSearch", true);
 		doubleTapToSwipe =prefs.getBoolean("doubleTapToSwipe", true);
@@ -224,7 +223,6 @@ public class GlobalUserPreferences{
 				.putBoolean("defaultToUnlistedReplies", defaultToUnlistedReplies)
 				.putBoolean("doubleTapToSearch", doubleTapToSearch)
 				.putBoolean("doubleTapToSwipe", doubleTapToSwipe)
-				.putBoolean("compactReblogReplyLine", compactReblogReplyLine)
 				.putBoolean("replyLineAboveHeader", replyLineAboveHeader)
 				.putBoolean("confirmBeforeReblog", confirmBeforeReblog)
 				.putBoolean("swapBookmarkWithBoostAction", swapBookmarkWithBoostAction)
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 05f02aba4..061760893 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -917,7 +917,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			return false;
 		});
 
-		publishButton.setOnClickListener(v->{
+		(GlobalUserPreferences.relocatePublishButton ? publishButtonRelocated : publishButton).setOnClickListener(v->{
 			Consumer<Boolean> draftCheckComplete=(isDraft)->{
 				if(GlobalUserPreferences.altTextReminders && !isDraft) checkAltTextsAndPublish();
 				else publish();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
index bb9d81188..9f0830b18 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
@@ -291,7 +291,7 @@ public abstract class StatusDisplayItem{
 				contentItems.add(new AudioStatusDisplayItem(parentID, fragment, statusForContent, att));
 			}
 			if(att.type==Attachment.Type.UNKNOWN){
-				contentItems.add(new FileStatusDisplayItem(parentID, fragment, att, statusForContent));
+				contentItems.add(new FileStatusDisplayItem(parentID, fragment, att));
 			}
 		}
 		if(statusForContent.poll!=null){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index 034d0c74b..4d3c43e95 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -830,30 +830,10 @@ public class UiUtils {
 	}
 
 	public static void performAccountAction(Activity activity, Account account, String accountID, Relationship relationship, Button button, Consumer<Boolean> progressCallback, Consumer<Relationship> resultCallback) {
-		if(relationship == null){
-			UiUtils.lookupAccount(button.getContext(), account, accountID, null, lookUpAccount -> {
-				if (lookUpAccount != null) {
-					progressCallback.accept(true);
-					follow(activity, accountID, lookUpAccount, true, progressCallback, resultCallback);
-				}
-			});
-			return;
-		}
-
 		if (relationship.blocking) {
 			confirmToggleBlockUser(activity, accountID, account, true, resultCallback);
 		} else if (relationship.muting) {
 			confirmToggleMuteUser(activity, accountID, account, true, resultCallback);
-		} else if (!relationship.following && !relationship.requested) {
-			follow(activity, accountID, account,  true, progressCallback, resultCallback);
-		} else if (GlobalUserPreferences.confirmUnfollow){
-			showConfirmationAlert(activity,
-					activity.getString(R.string.mo_confirm_unfollow_title),
-					activity.getString(R.string.mo_confirm_unfollow, account.getDisplayUsername()),
-					activity.getString(R.string.unfollow),
-					0,
-					() -> follow(activity, accountID, account, false, progressCallback, resultCallback),
-					() -> progressCallback.accept(false));
 		} else {
 			Runnable action=()->{
 				progressCallback.accept(true);