diff --git a/locales/en-US.yml b/locales/en-US.yml
index 10a6437936f3..49f31d01f7ea 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -114,6 +114,8 @@ common:
   mobile-mode: 'Mobile mode'
   empty: 'Empty'
   edit: 'Edit'
+  edit2: 'Quick edit'
+  edited: 'Edited'
   aboutInstance: "About this instance"
   favoriteReactions: "Favorite reactions"
   mostReacteds: "Most reacteds"
@@ -660,6 +662,7 @@ common/views/components/note-menu.vue:
   deleteDriveYes: "Delete drive files too"
   edit: "Edit"
   edit-confirm: "Are you sure you want to edit this post? Old post will be deleted."
+  edit2-confirm: "Quick edit leaves a history. if you don't want to keep it, use normal editing. Do you want to quick edit?"
   remote: "Show original note"
   report: "Report"
   report-abuse-detail: "What kind of nuisance did you encounter?"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 85013c1936d8..4666b5536f8a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -116,6 +116,8 @@ common:
   mobile-mode: 'モバイル版'
   empty: 'ありません！'
   edit: '編集'
+  edit2: '簡易編集'
+  edited: '編集済み'
   aboutInstance: "このインスタンスについて"
   favoriteReactions: "よくするリアクション"
   mostReacteds: "よくされるリアクション"
@@ -702,6 +704,7 @@ common/views/components/note-menu.vue:
   deleteDriveYes: "ドライブのファイルも削除する"
   edit: "編集"
   edit-confirm: "この投稿を編集しますか？古い投稿は削除されます。"
+  edit2-confirm: "簡易編集は履歴が残ります、残したくない場合は普通の編集を使用してください。簡易編集をしますか？"
   remote: "投稿元で見る"
   pin-limit-exceeded: "これ以上ピン留めできません。"
   report: "通報"
diff --git a/src/client/app/common/scripts/note-subscriber.ts b/src/client/app/common/scripts/note-subscriber.ts
index 1a630afa2b3e..00f5be93e71a 100644
--- a/src/client/app/common/scripts/note-subscriber.ts
+++ b/src/client/app/common/scripts/note-subscriber.ts
@@ -171,6 +171,13 @@ export default prop => ({
 					this.$_ns_target.cw = null;
 					break;
 				}
+
+				case 'updated': {
+					Vue.set(this.$_ns_target, 'updatedAt', body.updatedAt);
+					Vue.set(this.$_ns_target, 'text', body.text);
+					Vue.set(this.$_ns_target, 'cw', body.cw);
+					break;
+				}
 			}
 
 			this.$emit(`update:${prop}`, this.$_ns_note_);
diff --git a/src/client/app/common/scripts/post-form.ts b/src/client/app/common/scripts/post-form.ts
index ef5cc43ff65c..f81fc72878b7 100644
--- a/src/client/app/common/scripts/post-form.ts
+++ b/src/client/app/common/scripts/post-form.ts
@@ -44,7 +44,12 @@ export default (opts) => ({
 			type: Boolean,
 			required: false,
 			default: false
-		}
+		},
+		updateMode: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
 	},
 
 	data() {
@@ -482,7 +487,7 @@ export default (opts) => ({
 				text = `${text.replace(/\s+$/, '')}\n#${this.fixedTag}`;
 			}
 
-			this.$root.api('notes/create', {
+			this.$root.api(this.updateMode ? 'notes/update' : 'notes/create', {
 				text,
 				fileIds: this.files.length > 0 ? this.files.map(f => f.id) : undefined,
 				replyId: this.reply ? this.reply.id : undefined,
@@ -494,6 +499,7 @@ export default (opts) => ({
 				localOnly,
 				copyOnce,
 				viaMobile,
+				noteId: this.updateMode ? this.initialNote?.id : undefined,
 				geo: null
 			}).then(data => {
 				if (this.initialNote && this.initialNote._edit) {
diff --git a/src/client/app/common/views/components/note-header.vue b/src/client/app/common/views/components/note-header.vue
index 66af6862fab7..017c1364ab21 100644
--- a/src/client/app/common/views/components/note-header.vue
+++ b/src/client/app/common/views/components/note-header.vue
@@ -6,9 +6,9 @@
 	<span class="username"><mk-acct :user="note.user"/></span>
 	<x-user-badges :user="note.user" :key="note.user.id"/>
 	<div class="info" v-if="!noInfo">
-		<span class="mobile" v-if="note.viaMobile"><fa icon="mobile-alt"/></span>
 		<router-link v-if="noteUrl.startsWith('/')" class="created-at" :to="noteUrl"><mk-time :time="note.createdAt"/></router-link>
 		<a v-else class="created-at" :href="noteUrl"><mk-time :time="note.createdAt"/></a>
+		<span class="edited" :title="$t('@.edited')" v-if="note.updatedAt != null"><fa :icon="faEdit"/></span>
 		<x-visibility-icon class="visibility" :v="note.visibility" :localOnly="note.localOnly" :copyOnce="note.copyOnce"/>
 		<span class="remote" title="Remote post" v-if="note.user.host != null"><fa :icon="faGlobeAmericas"/></span>
 	</div>
@@ -18,7 +18,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../../i18n';
-import { faGlobeAmericas } from '@fortawesome/free-solid-svg-icons';
+import { faGlobeAmericas, faEdit } from '@fortawesome/free-solid-svg-icons';
 import XVisibilityIcon from '../../../common/views/components/visibility-icon.vue';
 import XUserBadges from '../../../common/views/components/user-badges.vue';
 import getAcct from '../../../../../misc/acct/render';
@@ -31,7 +31,7 @@ export default Vue.extend({
 	},
 	data() {
 		return {
-			faGlobeAmericas,
+			faGlobeAmericas, faEdit,
 		}
 	},
 	props: {
@@ -102,8 +102,8 @@ export default Vue.extend({
 		> *
 			color var(--noteHeaderInfo)
 
-		> .mobile
-			margin-right 8px
+		> .edited
+			margin-left 8px
 
 		> .visibility
 			margin-left 0.5em
diff --git a/src/client/app/common/views/components/note-menu.vue b/src/client/app/common/views/components/note-menu.vue
index 0fec51f7291f..5e1942bf96c0 100644
--- a/src/client/app/common/views/components/note-menu.vue
+++ b/src/client/app/common/views/components/note-menu.vue
@@ -9,6 +9,7 @@ import Vue from 'vue';
 import i18n from '../../../i18n';
 import { url } from '../../../config';
 import copyToClipboard from '../../../common/scripts/copy-to-clipboard';
+import { faEdit } from '@fortawesome/free-solid-svg-icons';
 import { faCopy } from '@fortawesome/free-regular-svg-icons';
 import { faPlaneArrival, faPlaneDeparture, faUserFriends, faPaperPlane, faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
 
@@ -117,6 +118,12 @@ export default Vue.extend({
 					text: this.$t('@.edit'),
 					action: this.edit
 				});
+
+				it.push({
+					icon: faEdit,
+					text: this.$t('@.edit2'),
+					action: this.edit2
+				});
 			}
 
 			// 削除
@@ -255,6 +262,21 @@ export default Vue.extend({
 			});
 		},
 
+		edit2() {
+			this.$root.dialog({
+				type: 'warning',
+				text: this.$t('edit2-confirm'),
+				showCancelButton: true
+			}).then(({ canceled }) => {
+				if (canceled) return;
+				this.$post({
+				initialNote: Object.assign({ }, this.note),
+				reply: this.note.reply,
+				updateMode: true,
+			});
+			});
+		},
+
 		toggleFavorite(favorite: boolean) {
 			this.$root.api(favorite ? 'notes/favorites/create' : 'notes/favorites/delete', {
 				noteId: this.note.id
diff --git a/src/client/app/common/views/deck/deck.notes.vue b/src/client/app/common/views/deck/deck.notes.vue
index 18bbb5777aa0..07e6199a8038 100644
--- a/src/client/app/common/views/deck/deck.notes.vue
+++ b/src/client/app/common/views/deck/deck.notes.vue
@@ -17,7 +17,7 @@
 				:note="note"
 				:next="_notes[i + 1]"
 				:prev="_notes[i - 1]"
-				:key="note.id"
+				:key="`${note.id}-${note.updatedAt}`"
 				@update:note="onNoteUpdated(i, $event)"
 				:compact="true"
 			/>
diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts
index a4d73fab63d6..dbd89c8164f3 100644
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -58,6 +58,7 @@ init(async (launch, os) => {
 						animation: o.animation == null ? true : o.animation,
 						initialText: o.initialText,
 						instant: o.instant,
+						updateMode: o.updateMode,
 						initialNote: o.initialNote
 					});
 					if (o.cb) vm.$once('closed', o.cb);
diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue
index 004c1ef5a62c..a548833859a6 100644
--- a/src/client/app/desktop/views/components/note-detail.vue
+++ b/src/client/app/desktop/views/components/note-detail.vue
@@ -58,6 +58,11 @@
 				{{ }}
 				<mk-time :time="appearNote.createdAt" mode="detail"/>
 			</router-link>
+			<div class="time" v-if="appearNote.updatedAt != null">
+				<fa :icon="faEdit"/>
+				{{ }}
+				<mk-time :time="appearNote.updatedAt" mode="detail"/>
+			</div>
 			<div class="visibility-info">
 				<x-visibility-icon class="visibility" :v="appearNote.visibility" :localOnly="appearNote.localOnly" :copyOnce="appearNote.copyOnce" :withText="true"/>
 			</div>
@@ -108,6 +113,7 @@ import XSub from './note.sub.vue';
 import noteSubscriber from '../../../common/scripts/note-subscriber';
 import noteMixin from '../../../common/scripts/note-mixin';
 import { faClock, faLaugh } from '@fortawesome/free-regular-svg-icons';
+import { faEdit } from '@fortawesome/free-solid-svg-icons';
 import XVisibilityIcon from '../../../common/views/components/visibility-icon.vue';
 import XInstanceInfo from '../../../common/views/components/instance-info.vue';
 
@@ -134,7 +140,7 @@ export default Vue.extend({
 
 	data() {
 		return {
-			faClock, faLaugh,
+			faClock, faLaugh, faEdit,
 			conversation: [],
 			conversationFetching: false,
 			replies: []
diff --git a/src/client/app/desktop/views/components/note.vue b/src/client/app/desktop/views/components/note.vue
index 9d7cb5f3231b..987141098ac4 100644
--- a/src/client/app/desktop/views/components/note.vue
+++ b/src/client/app/desktop/views/components/note.vue
@@ -67,6 +67,11 @@
 					{{ }}
 					<mk-time :time="appearNote.createdAt" mode="detail"/>
 				</router-link>
+				<div  v-if="detail && appearNote.updatedAt != null" class="time">
+					<fa :icon="faEdit"/>
+					{{ }}
+					<mk-time :time="appearNote.updatedAt" mode="detail"/>
+				</div>
 				<div v-if="detail" class="visibility-info">
 					<x-visibility-icon class="visibility" :v="appearNote.visibility" :localOnly="appearNote.localOnly" :copyOnce="appearNote.copyOnce" :withText="true"/>
 				</div>
@@ -122,6 +127,7 @@ import XSub from './note.sub.vue';
 import noteMixin from '../../../common/scripts/note-mixin';
 import noteSubscriber from '../../../common/scripts/note-subscriber';
 import { faClock, faLaugh } from '@fortawesome/free-regular-svg-icons';
+import { faEdit } from '@fortawesome/free-solid-svg-icons';
 import XInstanceInfo from '../../../common/views/components/instance-info.vue';
 import XVisibilityIcon from '../../../common/views/components/visibility-icon.vue';
 
@@ -182,7 +188,7 @@ export default Vue.extend({
 
 	data() {
 		return {
-			faClock, faLaugh,
+			faClock, faLaugh, faEdit,
 			conversation: [],
 			replies: []
 		};
diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue
index 59bf8abc603a..9101a087391c 100644
--- a/src/client/app/desktop/views/components/notes.vue
+++ b/src/client/app/desktop/views/components/notes.vue
@@ -17,7 +17,7 @@
 	<!-- トランジションを有効にするとなぜかメモリリークする -->
 	<component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notes" class="notes transition" tag="div" ref="notes">
 		<template v-for="(note, i) in _notes">
-			<mk-note :note="note" :next="_notes[i + 1]" :prev="_notes[i - 1]" :key="note.id" @update:note="onNoteUpdated(i, $event)" :compact="true" ref="note"/>
+			<mk-note :note="note" :next="_notes[i + 1]" :prev="_notes[i - 1]" :key="`${note.id}-${note.updatedAt}`" @update:note="onNoteUpdated(i, $event)" :compact="true" ref="note"/>
 		</template>
 	</component>
 
diff --git a/src/client/app/desktop/views/components/post-form-window.vue b/src/client/app/desktop/views/components/post-form-window.vue
index eb7cf211f21f..0803e00d6dbc 100644
--- a/src/client/app/desktop/views/components/post-form-window.vue
+++ b/src/client/app/desktop/views/components/post-form-window.vue
@@ -18,6 +18,7 @@
 			:mention="mention"
 			:initial-text="initialText"
 			:initial-note="initialNote"
+			:update-mode="updateMode"
 			:instant="instant"
 
 			@posted="onPosted"
@@ -65,6 +66,12 @@ export default Vue.extend({
 			required: false
 		},
 
+		updateMode: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
+
 		instant: {
 			type: Boolean,
 			required: false,
diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue
index 6eafe92dd4df..d0cf32af238f 100644
--- a/src/client/app/mobile/views/components/note-detail.vue
+++ b/src/client/app/mobile/views/components/note-detail.vue
@@ -56,6 +56,11 @@
 			{{ }}
 			<mk-time :time="appearNote.createdAt" mode="detail"/>
 		</router-link>
+		<div  class="time" v-if="appearNote.updatedAt != null">
+			<fa :icon="faEdit"/>
+			{{ }}
+			<mk-time :time="appearNote.updatedAt" mode="detail"/>
+		</div>
 		<div class="visibility-info">
 			<x-visibility-icon class="visibility" :v="appearNote.visibility" :localOnly="appearNote.localOnly" :copyOnce="appearNote.copyOnce" :withText="true"/>
 		</div>
@@ -107,6 +112,7 @@ import XSub from './note.sub.vue';
 import noteSubscriber from '../../../common/scripts/note-subscriber';
 import noteMixin from '../../../common/scripts/note-mixin';
 import { faClock, faLaugh } from '@fortawesome/free-regular-svg-icons';
+import { faEdit } from '@fortawesome/free-solid-svg-icons';
 import XVisibilityIcon from '../../../common/views/components/visibility-icon.vue';
 import XInstanceInfo from '../../../common/views/components/instance-info.vue';
 
@@ -133,7 +139,7 @@ export default Vue.extend({
 
 	data() {
 		return {
-			faClock, faLaugh,
+			faClock, faLaugh, faEdit,
 			conversation: [],
 			conversationFetching: false,
 			replies: []
diff --git a/src/client/app/mobile/views/components/notes.vue b/src/client/app/mobile/views/components/notes.vue
index 660145359b89..e86dcb4d3307 100644
--- a/src/client/app/mobile/views/components/notes.vue
+++ b/src/client/app/mobile/views/components/notes.vue
@@ -17,7 +17,7 @@
 	<!-- トランジションを有効にするとなぜかメモリリークする -->
 	<component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notes" class="transition" tag="div">
 		<template v-for="(note, i) in _notes">
-			<mk-note :note="note" :next="_notes[i + 1]" :prev="_notes[i - 1]" :key="note.id" @update:note="onNoteUpdated(i, $event)"/>
+			<mk-note :note="note" :next="_notes[i + 1]" :prev="_notes[i - 1]" :key="`${note.id}-${note.updatedAt}`" @update:note="onNoteUpdated(i, $event)"/>
 		</template>
 	</component>
 
diff --git a/src/remote/activitypub/kernel/update/index.ts b/src/remote/activitypub/kernel/update/index.ts
index 5f94abc59c5b..0128a54cc4f8 100644
--- a/src/remote/activitypub/kernel/update/index.ts
+++ b/src/remote/activitypub/kernel/update/index.ts
@@ -1,9 +1,10 @@
 import { IRemoteUser } from '../../../../models/user';
-import { IUpdate, isActor, getApType } from '../../type';
+import { IUpdate, isActor, getApType, isPost } from '../../type';
 import { apLogger } from '../../logger';
 import { updateQuestion } from '../../models/question';
 import Resolver from '../../resolver';
 import { updatePerson } from '../../models/person';
+import updateNote from './note';
 
 /**
  * Updateアクティビティを捌きます
@@ -28,6 +29,8 @@ export default async (actor: IRemoteUser, activity: IUpdate): Promise<string> =>
 	} else if (getApType(object) === 'Question') {	// isQuestionだとNoteを含んでいる
 		await updateQuestion(object, resolver).catch(e => console.log(e));
 		return `ok: Question updated`;
+	} else if (isPost(object)) {
+		return await updateNote(actor, object);
 	} else {
 		return `skip: Unknown type: ${getApType(object)}`;
 	}
diff --git a/src/remote/activitypub/kernel/update/note.ts b/src/remote/activitypub/kernel/update/note.ts
index d3501e60e90c..be2430168d60 100644
--- a/src/remote/activitypub/kernel/update/note.ts
+++ b/src/remote/activitypub/kernel/update/note.ts
@@ -1,28 +1,31 @@
 import { IRemoteUser } from '../../../../models/user';
-import deleteNode from '../../../../services/note/delete';
 import { apLogger } from '../../logger';
 import { getApLock } from '../../../../misc/app-lock';
 import DbResolver from '../../db-resolver';
 import { getApId, IPost } from '../../type';
 import { extractApHost } from '../../../../misc/convert-host';
-import { createNote } from '../../models/note';
-import { StatusError } from '../../../../misc/fetch';
+import { parseBasic } from '../../../../mfm/parse';
+import { extractEmojis } from '../../../../mfm/extract-emojis';
+import { extractHashtags } from '../../../../mfm/extract-hashtags';
+import Note from '../../../../models/note';
+import { publishNoteStream } from '../../../../services/stream';
+import { htmlToMfm } from '../../misc/html-to-mfm';
 
 const logger = apLogger;
 
 export default async function(actor: IRemoteUser, note: IPost): Promise<string> {
-	if (typeof note === 'object') {
-		if (actor.uri !== note.attributedTo) {
-			return `skip: actor.uri !== note.attributedTo`;
-		}
+	if (typeof note.id !== 'string') return 'skip';
 
-		if (typeof note.id === 'string') {
-			if (extractApHost(note.id) !== extractApHost(actor.uri)) {
-				return `skip: host in actor.uri !== host in note.id`;
-			}
-		}
+	// Note.attributedToは署名と同じである必要がある
+	if (actor.uri !== note.attributedTo) {
+		return `skip: actor.uri !== note.attributedTo`;
 	}
 
+	// Note.idのホストは署名と同一である必要がある
+	if (extractApHost(note.id) !== extractApHost(actor.uri)) {
+		return `skip: host in actor.uri !== host in note.id`;
+	}
+	
 	const uri = getApId(note);
 
 	logger.info(`Update the Note: ${uri}`);
@@ -31,24 +34,47 @@ export default async function(actor: IRemoteUser, note: IPost): Promise<string>
 
 	try {
 		const dbResolver = new DbResolver();
-		const old = await dbResolver.getNoteFromApId(uri);
 
-		if (!old) return 'skip: old note is not found';
+		// 元ノート照合
+		const origin = await dbResolver.getNoteFromApId(uri);
+		if (!origin) return 'skip: old note is not found';
 
-		if (!old.userId.equals(actor._id)) {
+		// 同じユーザーである必要がある
+		if (!origin.userId.equals(actor._id)) {
 			return '投稿をUpdateしようとしているユーザーは投稿の作成者ではありません';
 		}
 
-		await deleteNode(actor, old);
+		// validateはinboxのハードリミットでいい
 
-		const n = await createNote(note);
-		return n ? 'ok' : 'skip';
-	} catch (e) {
-		if (e instanceof StatusError && e.isClientError) {
-			return `skip ${e.statusCode}`;
-		} else {
-			throw e;
-		}
+		// テキストのパース
+		const text = note._misskey_content || (note.content ? htmlToMfm(note.content, note.tag) : null);
+		const cw = note.summary === '' ? null : note.summary;
+
+		// extract emojis, tags, mentions
+		const tokens = text ? (parseBasic(text) || []) : [];
+		const cwTokens = cw ? (parseBasic(cw) || []) : [];
+		const combinedTokens = tokens.concat(cwTokens);
+		const emojis = extractEmojis(combinedTokens);
+		const tags = extractHashtags(combinedTokens).filter(tag => Array.from(tag || '').length <= 128).splice(0, 64);
+
+		// Update
+		const updates = {
+			updatedAt: new Date(),
+			text: text?.trim(),
+			cw: cw ?? null,
+			emojis,
+			tags,
+		};
+
+		await Note.update({ _id: origin._id }, {
+			$set: updates
+		});
+
+		// Publish to streaming
+		publishNoteStream(origin._id, 'updated', updates);
+
+ 
+		return 'ok';
 	} finally {
 		unlock();
 	}
diff --git a/src/server/api/endpoints/notes/update.ts b/src/server/api/endpoints/notes/update.ts
new file mode 100644
index 000000000000..7bb7494a52ef
--- /dev/null
+++ b/src/server/api/endpoints/notes/update.ts
@@ -0,0 +1,164 @@
+import $ from 'cafy';
+import * as mongo from 'mongodb';
+import ID, { transform } from '../../../../misc/cafy-id';
+import * as ms from 'ms';
+import { length } from 'stringz';
+import Note, { isValidCw } from '../../../../models/note';
+import define from '../../define';
+import fetchMeta from '../../../../misc/fetch-meta';
+import { ApiError } from '../../error';
+import { getNote } from '../../common/getters';
+import { publishNoteStream } from '../../../../services/stream';
+import { oidEquals } from '../../../../prelude/oid';
+import renderNote from '../../../../remote/activitypub/renderer/note';
+import User, { IRemoteUser, isRemoteUser } from '../../../../models/user';
+import DeliverManager from '../../../../remote/activitypub/deliver-manager';
+import { deliverToRelays } from '../../../../services/relay';
+import renderUpdate from '../../../../remote/activitypub/renderer/update';
+import { renderActivity } from '../../../../remote/activitypub/renderer';
+import { parseBasic } from '../../../../mfm/parse';
+import { extractEmojis } from '../../../../mfm/extract-emojis';
+import { extractHashtags } from '../../../../mfm/extract-hashtags';
+import { extractMentionedUsers } from '../../../../services/note/create';
+
+let maxNoteTextLength = 1000;
+
+setInterval(() => {
+	fetchMeta().then(m => {
+		maxNoteTextLength = m.maxNoteTextLength || maxNoteTextLength;
+	});
+}, 60000);
+
+export const meta = {
+	desc: {
+		'ja-JP': '更新します。'
+	},
+
+	tags: ['notes'],
+
+	requireCredential: true,
+
+	limit: {
+		duration: ms('1hour'),
+		max: 300
+	},
+
+	kind: ['write:notes', 'note-write'],
+
+	params: {
+		noteId: {
+			validator: $.type(ID),
+			transform: transform,
+			desc: {
+				'ja-JP': '対象の投稿のID',
+			}
+		},
+
+		text: {
+			validator: $.optional.nullable.str.pipe(text =>
+				length(text?.trim()) <= maxNoteTextLength
+					&& length(text?.trim()) >= 1	// 更新の場合は空にできないことにする
+			),
+			default: null as any,
+			desc: {
+				'ja-JP': '投稿内容'
+			}
+		},
+
+		cw: {
+			validator: $.optional.nullable.str.pipe(isValidCw),
+			desc: {
+				'ja-JP': 'コンテンツの警告。このパラメータを指定すると設定したテキストで投稿のコンテンツを隠す事が出来ます。'
+			}
+		},
+	},
+
+	errors: {
+		noSuchNote: {
+			message: 'No such note.',
+			code: 'NO_SUCH_NOTE',
+			id: 'a6584e14-6e01-4ad3-b566-851e7bf0d474',
+		},
+	}
+};
+
+export default define(meta, async (ps, user, app) => {
+	// check note
+	const origin = await getNote(ps.noteId, user).catch(e => {
+		if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
+		throw e;
+	});
+
+	// check note owner
+	if (!oidEquals(origin.userId, user._id)) {
+		throw new ApiError(meta.errors.noSuchNote);
+	}
+
+	// extract emojis, tags, mentions
+	const tokens = ps.text ? (parseBasic(ps.text) || []) : [];
+	const cwTokens = ps.cw ? (parseBasic(ps.cw) || []) : [];
+	const combinedTokens = tokens.concat(cwTokens);
+	const emojis = extractEmojis(combinedTokens);
+	const tags = extractHashtags(combinedTokens).filter(tag => Array.from(tag || '').length <= 128).splice(0, 64);
+
+	// Update
+	const updates = {
+		updatedAt: new Date(),
+		text: ps.text?.trim(),
+		cw: ps.cw ?? null,
+		emojis,
+		tags,
+	};
+
+	await Note.update({ _id: origin._id }, {
+		$set: updates
+	});
+
+	// Publish to streaming
+	publishNoteStream(origin._id, 'updated', updates);
+
+	// AP Deliver
+	(async () => {
+		if (user.noFederation) return;
+		if (origin.localOnly) return;
+
+		const note = await Note.findOne({ _id: origin._id });
+		if (!note) return;
+
+		const activity = renderActivity(renderUpdate(await renderNote(note), user));
+
+		const dm = new DeliverManager(user, activity);
+
+		// メンションされたリモートユーザーに配送
+		for (const u of (note.mentionedRemoteUsers || [])) {
+			dm.addDirectRecipe(await User.findOne({ _id: u }) as IRemoteUser);
+		}
+
+		// リプライ先
+		if (note._reply?.user.host) {
+			dm.addDirectRecipe(await User.findOne({ _id: note._reply.user }) as IRemoteUser);
+		}
+
+		// Renote/Quote先
+		if (note._renote?.user.host) {
+			dm.addDirectRecipe(await User.findOne({ _id: note._renote.user }) as IRemoteUser);
+		}
+
+		// フォロワーへ配送
+		if (['public', 'home', 'followers'].includes(note.visibility)) {
+			dm.addFollowersRecipe();
+		}
+
+		// リレーへ配送
+		if (['public'].includes(note.visibility) && !note.copyOnce) {
+			deliverToRelays(user, activity);
+		}
+
+		// リモートのみ配送
+		if (note.visibility === 'specified' && note.copyOnce) {
+			dm.addFollowersRecipe();
+		}
+
+		dm.execute();
+	})();
+});
diff --git a/src/server/api/files.ts b/src/server/api/files.ts
index 31d7de9b2cc0..5e239554648d 100644
--- a/src/server/api/files.ts
+++ b/src/server/api/files.ts
@@ -184,6 +184,7 @@ export default [
   "notes/show",
   "notes/state",
   "notes/timeline",
+  "notes/update",
   "notes/user-list-timeline",
   "notes/watching/create",
   "notes/watching/delete-all",