diff --git a/locales/en-US.yml b/locales/en-US.yml
index 252092adfd..897bcb9026 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -570,6 +570,7 @@ serverLogs: "Server logs"
 deleteAll: "Delete all"
 showFixedPostForm: "Display the posting form at the top of the timeline"
 newNoteRecived: "There are new posts"
+newNotesCount: "There are {count} new posts"
 sounds: "Sounds"
 listen: "Listen"
 none: "None"
@@ -623,7 +624,10 @@ serviceworkerInfo: "Must be enabled for push notifications."
 deletedNote: "Deleted post"
 invisibleNote: "Invisible post"
 enableInfiniteScroll: "Automatically load more"
-visibility: "Visiblility"
+disableAutoUpdate: "Disable feeds auto update"
+lessObtrusiveFeedUpdates: "Less obtrusive feed updates indicator"
+preserveScroll: "Maintain scroll position after loading a new posts"
+visibility: "Visibility"
 poll: "Poll"
 useCw: "Hide content"
 enablePlayer: "Open video player"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 755afa8d3a..367936fbb9 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -521,6 +521,7 @@ serverLogs: "サーバーログ"
 deleteAll: "全て削除"
 showFixedPostForm: "タイムライン上部に投稿フォームを表示する"
 newNoteRecived: "新しい投稿があります"
+newNotesCount: "新しい投稿は{count}件"
 sounds: "サウンド"
 listen: "聴く"
 none: "なし"
@@ -567,6 +568,9 @@ serviceworkerInfo: "プッシュ通知を行うには有効にする必要があ
 deletedNote: "削除された投稿"
 invisibleNote: "非公開の投稿"
 enableInfiniteScroll: "自動でもっと見る"
+disableAutoUpdate: "フィードの自動更新を無効にする"
+lessObtrusiveFeedUpdates: "邪魔にならないフィード更新インジケータ"
+preserveScroll: "新しい投稿を読み込んだ後、スクロール位置を維持する"
 visibility: "公開範囲"
 poll: "アンケート"
 useCw: "内容を隠す"
@@ -1901,14 +1905,14 @@ hiddenTags: 非表示にするハッシュタグ
 apps: "アプリ"
 _experiments:
   title: 試験的な機能
-  postImportsCaption: 
+  postImportsCaption:
     ユーザーが過去の投稿をCalckey・Misskey・Mastodon・Akkoma・Pleromaからインポートすることを許可します。キューが溜まっているときにインポートするとサーバーに負荷がかかる可能性があります。
   enablePostImports: 投稿のインポートを有効にする
 sendModMail: モデレーション通知を送る
 deleted: 削除済み
 editNote: 投稿を編集
 edited: '編集済み: {date} {time}'
-signupsDisabled: 
+signupsDisabled:
   現在、このサーバーでは新規登録が一般開放されていません。招待コードをお持ちの場合には、以下の欄に入力してください。招待コードをお持ちでない場合にも、新規登録を開放している他のサーバーには入れますよ！
 findOtherInstance: 他のサーバーを探す
 newer: 新しい投稿
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 643a84eef0..0914f93bf6 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -539,6 +539,7 @@ serverLogs: "Журнал сервера"
 deleteAll: "Удалить всё"
 showFixedPostForm: "Показывать поле для ввода нового поста наверху ленты"
 newNoteRecived: "Появился новый пост"
+newNotesCount: "Новых постов: {count}"
 sounds: "Звуки"
 listen: "Слушать"
 none: "Ничего"
@@ -590,6 +591,9 @@ serviceworkerInfo: "Нужно включить, чтобы работали pus
 deletedNote: "Удалённый пост"
 invisibleNote: "Личное сообщение"
 enableInfiniteScroll: "Включить бесконечную прокрутку"
+disableAutoUpdate: "Отключить автообновление лент"
+lessObtrusiveFeedUpdates: "Ненавязчивый индикатор обновлений в лентах"
+preserveScroll: "Сохранение позиции прокрутки после загрузки новых сообщений"
 visibility: "Видимость"
 poll: "Опрос"
 useCw: "Скрывать содержимое под предупреждением"
diff --git a/packages/client/src/components/MkDateSeparatedList.vue b/packages/client/src/components/MkDateSeparatedList.vue
index 4958d87708..1f796cbc1b 100644
--- a/packages/client/src/components/MkDateSeparatedList.vue
+++ b/packages/client/src/components/MkDateSeparatedList.vue
@@ -1,9 +1,11 @@
 <script lang="ts">
 import type { PropType } from "vue";
-import { TransitionGroup, defineComponent, h } from "vue";
+import { TransitionGroup, defineComponent, h, ref } from "vue";
 import MkAd from "@/components/global/MkAd.vue";
+import MkButton from "@/components/MkButton.vue";
 import { i18n } from "@/i18n";
 import { defaultStore } from "@/store";
+import { getScrollContainer } from "@/scripts/scroll";
 
 export default defineComponent({
 	props: {
@@ -28,6 +30,11 @@ export default defineComponent({
 			required: false,
 			default: false,
 		},
+		noAutoupdate: {
+			type: Boolean,
+			required: false,
+			default: false,
+		},
 		ad: {
 			type: Boolean,
 			required: false,
@@ -47,14 +54,77 @@ export default defineComponent({
 
 		if (props.items.length === 0) return;
 
-		const renderChildren = () =>
-			props.items.map((item, i) => {
+		let lastRenderedDate = ref(props.items[0].createdAt);
+		let newPostsCount = 0;
+		let lastTopPostId: null | string = null;
+
+		const scrollToLastTopPost = (element: HTMLElement) => {
+			if (lastTopPostId) {
+				const closestTimeline = element.closest(".sqadhkmv");
+				if (closestTimeline) {
+					const elem = closestTimeline.querySelector(
+						`[id="${lastTopPostId}"]`,
+					);
+					if (elem instanceof HTMLElement) {
+						setTimeout(
+							() => {
+								let scrollContainer:
+									| HTMLElement
+									| Window
+									| null = getScrollContainer(elem);
+								let prop = "scrollTop";
+								if (!scrollContainer) {
+									scrollContainer = window;
+									prop = "scrollY";
+								}
+								if (scrollContainer) {
+									const top =
+										elem.getBoundingClientRect().top +
+										scrollContainer[prop] -
+										80; /* minus 80 pixels to show part of lowest new post and so old post wouldn't end up under the header (probably scroll-margin/scroll-padding would be better) */
+									scrollContainer.scrollTo({
+										top,
+									});
+								}
+							},
+							defaultStore.state.animation ? 700 : 2,
+						);
+					}
+				}
+			}
+		};
+
+		const showNewPosts = (event: PointerEvent) => {
+			lastRenderedDate.value = props.items[0].createdAt;
+			if (
+				defaultStore.state.preserveScroll &&
+				event.target instanceof HTMLElement
+			) {
+				scrollToLastTopPost(event.target);
+			}
+		};
+
+		const renderChildren = () => {
+			newPostsCount = 0;
+			lastTopPostId = null;
+			let itemsToRender = props.items;
+			if (props.noAutoupdate) {
+				itemsToRender = itemsToRender.filter((item) => {
+					const filtered = item.createdAt <= lastRenderedDate.value;
+					if (!filtered) {
+						newPostsCount += 1;
+					}
+					return filtered;
+				});
+			}
+			const renderedItems = itemsToRender.map((item, i) => {
 				if (!slots || !slots.default) return;
 
 				const el = slots.default({
 					item,
 				})[0];
 				if (el.key == null && item.id) el.key = item.id;
+				if (!lastTopPostId) lastTopPostId = item.id;
 
 				if (
 					i !== props.items.length - 1 &&
@@ -105,9 +175,25 @@ export default defineComponent({
 					}
 				}
 			});
+			if (newPostsCount) {
+				renderedItems.unshift(
+					h(
+						MkButton,
+						{
+							primary: true,
+							onClick: showNewPosts,
+						},
+						i18n.t("newNotesCount", {
+							count: newPostsCount,
+						}),
+					),
+				);
+			}
+			return renderedItems;
+		};
 
-		return () =>
-			h(
+		return () => {
+			return h(
 				defaultStore.state.animation ? TransitionGroup : "div",
 				defaultStore.state.animation
 					? {
@@ -122,6 +208,7 @@ export default defineComponent({
 					  },
 				{ default: renderChildren },
 			);
+		};
 	},
 });
 </script>
@@ -212,5 +299,9 @@ export default defineComponent({
 			}
 		}
 	}
+
+	> ._button {
+		margin-inline: auto;
+	}
 }
 </style>
diff --git a/packages/client/src/components/MkNotes.vue b/packages/client/src/components/MkNotes.vue
index 5916621840..ddfd871000 100644
--- a/packages/client/src/components/MkNotes.vue
+++ b/packages/client/src/components/MkNotes.vue
@@ -20,6 +20,7 @@
 					:direction="pagination.reversed ? 'up' : 'down'"
 					:reversed="pagination.reversed"
 					:no-gap="noGap"
+					:no-autoupdate="noAutoupdate"
 					:ad="true"
 					class="notes"
 				>
@@ -48,6 +49,7 @@ const tlEl = ref<HTMLElement>();
 const props = defineProps<{
 	pagination: Paging;
 	noGap?: boolean;
+	noAutoupdate?: boolean;
 }>();
 
 const pagingComponent = ref<InstanceType<typeof MkPagination>>();
diff --git a/packages/client/src/components/MkTimeline.vue b/packages/client/src/components/MkTimeline.vue
index a44d641847..f6cc5923ac 100644
--- a/packages/client/src/components/MkTimeline.vue
+++ b/packages/client/src/components/MkTimeline.vue
@@ -14,6 +14,7 @@
 			class="_buttonPrimary _shadow"
 			@click="tlComponent.scrollTop()"
 			:class="{ instant: !$store.state.animation }"
+			v-if="!$store.state.lessObtrusiveFeedUpdates"
 		>
 			{{ i18n.ts.newNoteRecived }}
 			<i class="ph-arrow-up ph-bold"></i>
@@ -22,6 +23,7 @@
 	<XNotes
 		ref="tlComponent"
 		:no-gap="!$store.state.showGapBetweenNotesInTimeline"
+		:no-autoupdate="$store.state.disableAutoUpdate"
 		:pagination="pagination"
 		@queue="(x) => (queue = x)"
 	/>
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index f7b226b33e..14bfa51646 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -40,6 +40,18 @@
 			<FormSwitch v-model="enableInfiniteScroll" class="_formBlock">{{
 				i18n.ts.enableInfiniteScroll
 			}}</FormSwitch>
+			<FormSwitch v-model="disableAutoUpdate" class="_formBlock">{{
+				i18n.ts.disableAutoUpdate
+			}}</FormSwitch>
+			<FormSwitch
+				v-if="defaultStore.state.disableAutoUpdate"
+				v-model="preserveScroll"
+				class="_formBlock"
+				>{{ i18n.ts.preserveScroll }}</FormSwitch
+			>
+			<FormSwitch v-model="lessObtrusiveFeedUpdates" class="_formBlock">{{
+				i18n.ts.lessObtrusiveFeedUpdates
+			}}</FormSwitch>
 			<FormSwitch
 				v-model="useReactionPickerForContextMenu"
 				class="_formBlock"
@@ -335,6 +347,15 @@ const instanceTicker = computed(
 const enableInfiniteScroll = computed(
 	defaultStore.makeGetterSetter("enableInfiniteScroll"),
 );
+const disableAutoUpdate = computed(
+	defaultStore.makeGetterSetter("disableAutoUpdate"),
+);
+const lessObtrusiveFeedUpdates = computed(
+	defaultStore.makeGetterSetter("lessObtrusiveFeedUpdates"),
+);
+const preserveScroll = computed(
+	defaultStore.makeGetterSetter("preserveScroll"),
+);
 const enterSendsMessage = computed(
 	defaultStore.makeGetterSetter("enterSendsMessage"),
 );
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 25ed553070..cbfe7bb956 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -226,6 +226,18 @@ export const defaultStore = markRaw(
 			where: "device",
 			default: true,
 		},
+		disableAutoUpdate: {
+			where: "device",
+			default: false,
+		},
+		lessObtrusiveFeedUpdates: {
+			where: "device",
+			default: false,
+		},
+		preserveScroll: {
+			where: "device",
+			default: false,
+		},
 		useReactionPickerForContextMenu: {
 			where: "device",
 			default: false,
@@ -381,7 +393,10 @@ export class ColdDeviceStorage {
 		sound_channel: { type: "syuilo/square-pico", volume: 1 },
 	};
 
-	public static watchers = [];
+	public static watchers: Array<{
+		key: any;
+		callback: (value: any) => void;
+	}> = [];
 
 	public static get<T extends keyof typeof ColdDeviceStorage.default>(
 		key: T,