diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/misskey/requests/timelines/GetHomeTimeline.java b/mastodon/src/main/java/org/joinmastodon/android/api/misskey/requests/timelines/GetHomeTimeline.java
new file mode 100644
index 000000000..2c0c4763a
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/misskey/requests/timelines/GetHomeTimeline.java
@@ -0,0 +1,25 @@
+package org.joinmastodon.android.api.misskey.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;
+
+import java.util.List;
+
+public class GetHomeTimeline extends MastodonAPIRequest<List<Status>>{
+	public GetHomeTimeline(String maxID, String minID, int limit, String sinceID){
+		super(HttpMethod.GET, "/timelines/home", new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(minID!=null)
+			addQueryParameter("min_id", minID);
+		if(sinceID!=null)
+			addQueryParameter("since_id", sinceID);
+		if(limit>0)
+			addQueryParameter("limit", ""+limit);
+		if(GlobalUserPreferences.replyVisibility != null)
+			addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java
index 91aa8fc5c..737d5b082 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java
@@ -48,12 +48,12 @@ public class FileStatusDisplayItem extends StatusDisplayItem{
         @Override
         public void onBind(FileStatusDisplayItem item){
             title.setText(item.attachment.description == null ? title.getContext().getText(R.string.media_no_description) : item.attachment.description);
-            domain.setText(Uri.parse(item.attachment.url).getHost());
+            domain.setText(Uri.parse(item.attachment.remoteUrl == null ? item.attachment.url : item.attachment.remoteUrl).getHost());
 
         }
 
         private void onClick(View v){
-            UiUtils.openURL(itemView.getContext(), item.parentFragment.getAccountID(), item.attachment.url);
+            UiUtils.openURL(itemView.getContext(), item.parentFragment.getAccountID(), item.attachment.remoteUrl == null ? item.attachment.url : item.attachment.remoteUrl);
         }
     }
 }