diff --git a/client/src/i18n/de.json b/client/src/i18n/de.json
index 2338ebb..fe2859f 100644
--- a/client/src/i18n/de.json
+++ b/client/src/i18n/de.json
@@ -21,6 +21,8 @@
       "back": "Zurück",
       "close": "Schließen",
       "save": "Speichern",
+      "publish": "Veröffentlichen",
+      "savedraft": "Als Entwurf speichern",
       "cancel": "Abbrechen",
       "edit": "Bearbeiten",
       "delete": "Löschen",
@@ -29,7 +31,9 @@
       "roles": "Rollen",
       "login": "Anmelden",
       "githubLinkText": "Die Blog-Software auf GitHub",
-      "startpage": "Startseite"
+      "startpage": "Startseite",
+      "restore": "Wiederherstellen",
+      "discard": "Verwerfen"
     }
   },
   "nav": {
@@ -59,7 +63,8 @@
         "tags": "Schlagworte",
         "enter": "Geben Sie Schlagworte ein..."
       },
-      "imageupload": "keine angehängten Bilder | ein angehängtes Bild | {count} angehängte Bilder"
+      "imageupload": "keine angehängten Bilder | ein angehängtes Bild | {count} angehängte Bilder",
+      "restore": "Unveröffentlichte Version gefunden"
     },
     "confirm": {
       "title": "Löschen bestätigen",
@@ -69,7 +74,7 @@
       "not-available": {
         "title": "Post nicht vorhanden",
         "message": "Der Post ist nicht verfügbar oder wurde gelöscht. Sie können mit dem Button zur Startseite zurück, oder nutzen sie die Suchfunktion um einen bestimmten Post zu finden."
-      } 
+      }
     }
   },
   "admin": {
diff --git a/client/src/i18n/en.json b/client/src/i18n/en.json
index 0a73092..cf765b1 100644
--- a/client/src/i18n/en.json
+++ b/client/src/i18n/en.json
@@ -21,6 +21,8 @@
       "back": "Back",
       "close": "Close",
       "save": "Save",
+      "publish": "Publish",
+      "savedraft": "Save draft",
       "cancel": "Cancel",
       "edit": "Edit",
       "delete": "Delete",
@@ -29,7 +31,9 @@
       "roles": "Roles",
       "login": "Login",
       "githubLinkText": "The blog software on GitHub",
-      "startpage": "Startpage"
+      "startpage": "Startpage",
+      "restore": "Restore",
+      "discard": "Discard"
     }
   },
   "nav": {
@@ -56,7 +60,8 @@
         "title": "Preview"
       },
       "imageupload": "Upload image",
-      "tags": "Tags"
+      "tags": "Tags",
+      "restore": "Unpublished version found"
     },
     "confirm": {
       "title": "Confirm deletion",
@@ -66,7 +71,7 @@
       "not-available": {
         "title": "Post not available",
         "message": "This post is not available or has been deleted. You can find all posts in the overview, or use the search function to find a specific post."
-      } 
+      }
     }
   },
   "admin": {
diff --git a/client/src/util/api-client.ts b/client/src/util/api-client.ts
index 6f8d423..6e9221b 100644
--- a/client/src/util/api-client.ts
+++ b/client/src/util/api-client.ts
@@ -2,7 +2,7 @@ import { loadIdToken, updateIdToken } from "@client/util/storage.js";
 import type {
   AiSummaryData,
   DataUrl,
-  DraftResponseDto,
+  SavePostResponseDto,
   EditPostRequestDto,
   JsonMimeType,
   NewPostRequestDto,
@@ -19,7 +19,7 @@ async function callServer<
   ResponseType = ResponseMimeType extends JsonMimeType ? any : ResponseMimeType extends SupportedImageMimeType ? ArrayBuffer : any,
 >(
   url: ApiUrl,
-  method: "GET" | "POST",
+  method: "GET" | "POST" | "DELETE" | "PUT",
   responseType: ResponseMimeType,
   payload: ApiRequestJsonPayload<RequestType> | null = null,
   authenticated = true,
@@ -113,19 +113,19 @@ export class OpenAiEndpoints {
 }
 
 export class PostEndpoints {
-  static async createPostWithoutFiles(json: NewPostRequestDto): Promise<DraftResponseDto> {
-    return callServer<NewPostRequestDto, JsonMimeType, DraftResponseDto>("/api/posts/new", "POST", "application/json", { json: json });
+  static async createPostWithoutFiles(json: NewPostRequestDto): Promise<SavePostResponseDto> {
+    return callServer<NewPostRequestDto, JsonMimeType, SavePostResponseDto>("/api/posts/new", "POST", "application/json", { json: json });
   }
-  static async createPost(json: NewPostRequestDto, files: File[]): Promise<DraftResponseDto> {
-    return callServer<NewPostRequestDto, JsonMimeType, DraftResponseDto>(
+  static async createPost(json: NewPostRequestDto, files: File[]): Promise<SavePostResponseDto> {
+    return callServer<NewPostRequestDto, JsonMimeType, SavePostResponseDto>(
       "/api/posts/new",
       "POST",
       "application/json",
       new ApiRequestJsonPayloadWithFiles(json, files),
     );
   }
-  static async editPost(json: EditPostRequestDto, files: File[]): Promise<DraftResponseDto> {
-    return callServer<EditPostRequestDto, JsonMimeType, DraftResponseDto>(
+  static async editPost(json: EditPostRequestDto, files: File[]): Promise<SavePostResponseDto> {
+    return callServer<EditPostRequestDto, JsonMimeType, SavePostResponseDto>(
       `/api/posts/${json.id}`,
       "POST",
       "application/json",
@@ -133,6 +133,9 @@ export class PostEndpoints {
     );
   }
   static async deletePost(id: number): Promise<{ affected: number }> {
-    return callServer<void, JsonMimeType, { affected: number }>(`/api/posts/delete/${id}`, "POST", "application/json");
+    return callServer<void, JsonMimeType, { affected: number }>(`/api/posts/${id}`, "DELETE", "application/json");
+  }
+  static async deleteAutosave(id: number): Promise<{ affected: number }> {
+    return callServer<void, JsonMimeType, { affected: number }>(`/api/posts/autosave/${id}`, "DELETE", "application/json");
   }
 }
diff --git a/client/src/views/PostFormView.vue b/client/src/views/PostFormView.vue
index 8e8dfa7..7644997 100644
--- a/client/src/views/PostFormView.vue
+++ b/client/src/views/PostFormView.vue
@@ -1,10 +1,39 @@
 <template>
   <div v-if="!postHasError" class="container">
+    <div v-if="hasAutosave" class="row mb-2 collapse show" id="collapseTarget">
+      <div class="col w-50">
+        <div class="alert alert-warning">
+          {{ t("posts.form.restore") }}
+          <button
+            type="button"
+            class="btn btn-sm btn-primary mx-3"
+            data-bs-toggle="collapse"
+            data-bs-target="#collapseTarget"
+            aria-expanded="true"
+            aria-controls="collapseTarget"
+            @click="restore"
+          >
+            {{ t("app.base.restore") }}
+          </button>
+          <button
+            type="button"
+            class="btn btn-sm btn-danger"
+            data-bs-toggle="collapse"
+            data-bs-target="#collapseTarget"
+            aria-expanded="true"
+            aria-controls="collapseTarget"
+            @click="discard"
+          >
+            {{ t("app.base.discard") }}
+          </button>
+        </div>
+      </div>
+    </div>
     <div class="row mb-2">
       <div class="col w-50">
         <div class="card flex-md-row mb-4 box-shadow h-md-250">
           <div class="card-body">
-            <form @submit="submitForm($event)">
+            <form @submit.prevent="submitForm" @change="handleAutoSave">
               <div class="form-floating mb-3">
                 <input v-model="form.title" type="text" class="form-control" id="title" placeholder="Titel" required />
                 <label for="title">{{ t("posts.form.title") }}</label>
@@ -57,13 +86,11 @@
                 <div id="markdownHelp" class="form-text">{{ t("posts.form.message.hint") }}</div>
               </div>
 
-              <div class="form-check form-switch">
-                <input v-model="form.draft" class="form-check-input" type="checkbox" id="draft" />
-                <label class="form-check-label" for="draft">{{ t("posts.form.draft") }}</label>
-              </div>
-
-              <button type="submit" class="btn btn-sm btn-primary float-end">{{ t("app.base.save") }}</button>
-              <button type="button" class="btn btn-sm btn-secondary float-end mx-3" @click="router.go(-1)">
+              <button type="submit" class="btn btn-sm btn-primary float-end">{{ t("app.base.publish") }}</button>
+              <button type="button" class="btn btn-sm btn-info float-end mx-3" @click="saveDraft">
+                {{ t("app.base.savedraft") }}
+              </button>
+              <button type="button" class="btn btn-sm btn-secondary float-end" @click="router.go(-1)">
                 {{ t("app.base.cancel") }}
               </button>
             </form>
@@ -284,8 +311,15 @@ import { debounce } from "@client/debounce.js";
 import { PostEndpoints } from "@client/util/api-client.js";
 import { faUpload } from "@fortawesome/free-solid-svg-icons";
 import { t, tc } from "@client/plugins/i18n.js";
-import type { DraftResponseDto, NewPostRequestDto, Post, Tag, SupportedInsertPositionType } from "@fumix/fu-blog-common";
-import { bytesToBase64URL, convertToHumanReadableFileSize } from "@fumix/fu-blog-common";
+import type {
+  SavePostResponseDto,
+  NewPostRequestDto,
+  Post,
+  Tag,
+  SupportedInsertPositionType,
+  EditPostRequestDto,
+} from "@fumix/fu-blog-common";
+import { bytesToBase64URL, convertToHumanReadableFileSize, isNeitherNullNorUndefined } from "@fumix/fu-blog-common";
 import { computed, onMounted, reactive, ref, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import VueTagsInput from "@sipec/vue3-tags-input";
@@ -300,6 +334,8 @@ const router = useRouter();
 const markdownArea = ref(null);
 const postHasError = ref<boolean>(false);
 const tagList = ref<Tag[]>([]);
+const foundAutosave = ref<Post | null>(null);
+const hasAutosave = ref<boolean>(false);
 
 const form = reactive<NewPostRequestDto>({
   title: "",
@@ -307,6 +343,7 @@ const form = reactive<NewPostRequestDto>({
   markdown: "",
   draft: false,
   stringTags: [],
+  autosave: false,
 });
 
 const props = defineProps({
@@ -340,9 +377,15 @@ onMounted(async () => {
       form.draft = resJson.draft;
       tags.value = resJson.tags ? resJson.tags?.map((tag) => ({ text: tag.name })) : [];
       postHasError.value = false;
+      let findAutosaveResponse = await fetch(`/api/posts/autosave/${props.postId}`);
+      foundAutosave.value = (await findAutosaveResponse.json())?.data as Post;
+      hasAutosave.value = foundAutosave.value !== null;
     } catch (e) {
       postHasError.value = true;
     }
+  } else {
+    // foundAutosave.value = ref<Post>((await (await fetch(`/api/posts/autosave`)).json())?.data as Post);
+    // console.log("found autosave " + JSON.stringify(foundAutosave.value));
   }
 
   debounce(() => {
@@ -404,6 +447,26 @@ const handleFileChange = (e: Event): void => {
   }
 };
 
+const discard = async () => {
+  const postToDiscard = foundAutosave.value as Post;
+  if (postToDiscard?.id) {
+    await PostEndpoints.deleteAutosave(postToDiscard.id).catch((reason) => console.log("failed to delete autosave", reason));
+  }
+};
+
+const restore = () => {
+  if (foundAutosave.value) {
+    // restore autosaved post to the form
+    const toRestore = foundAutosave.value as Post;
+    form.draft = toRestore.draft;
+    form.title = toRestore.title;
+    form.stringTags = toRestore.tags ? toRestore.tags?.map((tag) => tag.name).filter(isNeitherNullNorUndefined) : [];
+    tags.value = toRestore.tags ? toRestore.tags?.map((tag) => ({ text: tag.name })) : [];
+    form.markdown = toRestore.markdown;
+    form.description = toRestore.description;
+  }
+};
+
 const handleTagsChanged = (newTags: any[]) => {
   tags.value = newTags;
 };
@@ -449,6 +512,11 @@ const setDescription = (description: string) => {
   form.description = description;
 };
 
+const handleAutoSave = () =>
+  debounce(() => {
+    send(props.postId, true);
+  }, 1000);
+
 const setKeyvisual = (base64Str: string) => {
   fetch(base64Str)
     .then((res) => res.blob())
@@ -472,9 +540,13 @@ const addFile = (file: File) => {
     .catch((it) => console.error("Failed to calculate SHA-256 hash!"));
 };
 
-const submitForm = (e: Event) => {
-  e.preventDefault();
-  send(props.postId);
+const submitForm = () => {
+  send(props.postId, false);
+};
+
+const saveDraft = () => {
+  form.draft = true;
+  send(props.postId, false);
 };
 
 const insertIntoTextarea = (
@@ -491,16 +563,24 @@ const insertIntoTextarea = (
   return before + insertedText + after;
 };
 
-const send = async (id: number | undefined) => {
-  const successAction = (r: DraftResponseDto) => {
-    router.push(`/posts/post/${r.postId}`);
+const send = async (id: number | undefined, shouldAutosave: boolean) => {
+  const successAction = (r: SavePostResponseDto) => {
+    if (shouldAutosave) {
+      // TODO: display draft saved banner
+      console.log("auto-saving...");
+    } else {
+      router.push(`/posts/post/${r.postId}`);
+    }
   };
   if (!id) {
+    form.autosave = shouldAutosave;
     await PostEndpoints.createPost(form, Object.values(files))
       .then(successAction)
       .catch((reason) => console.log("Create post request failed", reason));
   } else {
-    await PostEndpoints.editPost(Object.assign(form, { id }), Object.values(files))
+    let editRequest = Object.assign(form, { id }) as EditPostRequestDto;
+    editRequest.autosave = shouldAutosave;
+    await PostEndpoints.editPost(editRequest, Object.values(files))
       .then(successAction)
       .catch((reason) => console.log("Edit post request failed", reason));
   }
diff --git a/client/src/views/PostView.vue b/client/src/views/PostView.vue
index 3518992..e260b70 100644
--- a/client/src/views/PostView.vue
+++ b/client/src/views/PostView.vue
@@ -92,6 +92,7 @@ import { useSeoMeta } from "@unhead/vue";
 import { onMounted, type PropType, ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRoute, useRouter } from "vue-router";
+import { PostEndpoints } from "@client/util/api-client";
 
 const { t } = useI18n();
 const loading = ref(true);
@@ -131,13 +132,10 @@ onMounted(async () => {
 });
 
 const deletePost = async (post: Post) => {
-  try {
-    const res = await fetch(`/api/posts/delete/${post.id}`);
-    await res.json();
-    router.push("/posts");
-  } catch (e) {
-    console.log("ERROR: ", e);
+  if (post.id) {
+    const res = await PostEndpoints.deletePost(post.id).catch((reason) => console.log("failed to delete autosave", reason));
   }
+  router.push("/posts");
 };
 
 const showConfirm = (post: Post | null) => {
diff --git a/client/src/views/PostsView.vue b/client/src/views/PostsView.vue
index f24961e..035021e 100644
--- a/client/src/views/PostsView.vue
+++ b/client/src/views/PostsView.vue
@@ -14,7 +14,8 @@
       <div class="col-lg-8 col-lg-border">
         <div v-if="props.userPermissions?.canCreatePost" class="clearfix mb-4">
           <button type="button" class="btn btn-sm btn-secondary float-end" @click="goTo('/posts/post/new')">
-            <fa-icon :icon="faAdd" /> {{ t("app.base.create_post") }}
+            <fa-icon :icon="faAdd" />
+            {{ t("app.base.create_post") }}
           </button>
         </div>
 
@@ -33,7 +34,8 @@
           ></post-preview>
 
           <div v-if="!totalPages && route.query.search" class="alert alert-light text-center">
-            <fa-icon :icon="faSadTear" class="mx-3" />{{ t("search.noResults", { query: route.query.search }) }}
+            <fa-icon :icon="faSadTear" class="mx-3" />
+            {{ t("search.noResults", { query: route.query.search }) }}
           </div>
 
           <paginate
@@ -82,6 +84,7 @@ import { onMounted, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRoute, useRouter } from "vue-router";
 import Paginate from "vuejs-paginate-next";
+import { PostEndpoints } from "@client/util/api-client";
 
 const route = useRoute();
 const router = useRouter();
@@ -146,15 +149,12 @@ onMounted(() => {
 });
 
 const deletePost = async (post: Post) => {
-  try {
-    const res = await fetch(`/api/posts/delete/${post.id}`);
-    await res.json();
-    const searchValue = (route.query?.search || "") as string;
-    const operator = (route.query?.operator || "and") as string;
-    await loadPostsWithPagination(1, searchValue, operator);
-  } catch (e) {
-    console.log("ERROR: ", e);
+  if (post.id) {
+    const res = await PostEndpoints.deletePost(post.id).catch((reason) => console.log("failed to delete autosave", reason));
   }
+  const searchValue = (route.query?.search || "") as string;
+  const operator = (route.query?.operator || "and") as string;
+  await loadPostsWithPagination(1, searchValue, operator).catch((reason) => console.log("failed to load posts", reason));
 };
 
 const goTo = (path: string) => {
diff --git a/common/src/entity/Post.ts b/common/src/entity/Post.ts
index cac153b..5e8dd63 100644
--- a/common/src/entity/Post.ts
+++ b/common/src/entity/Post.ts
@@ -1,6 +1,6 @@
 import { Attachment } from "./Attachment.js";
 import type { Tag } from "./Tag.js";
-import type { PublicUserInfo } from "./User.js";
+import type { PublicUserInfo, User } from "./User.js";
 
 export type Post = {
   id?: number;
@@ -15,9 +15,11 @@ export type Post = {
   attachments?: Attachment[];
   draft: boolean;
   tags?: Tag[];
+  autosaveRefPost?: Post;
+  autosaveRefUser?: User;
 };
 
-export type NewPostRequestDto = Pick<Post, "title" | "description" | "markdown" | "draft"> & { stringTags: string[] };
+export type NewPostRequestDto = Pick<Post, "title" | "description" | "markdown" | "draft"> & { stringTags: string[]; autosave: boolean };
 export type EditPostRequestDto = NewPostRequestDto & { id: number };
 
 export type PostRequestDto = NewPostRequestDto | EditPostRequestDto;
diff --git a/common/src/entity/DraftResponseDto.ts b/common/src/entity/SavePostResponseDto.ts
similarity index 73%
rename from common/src/entity/DraftResponseDto.ts
rename to common/src/entity/SavePostResponseDto.ts
index 11c9cdd..696f92d 100644
--- a/common/src/entity/DraftResponseDto.ts
+++ b/common/src/entity/SavePostResponseDto.ts
@@ -1,6 +1,6 @@
 import { Attachment } from "./Attachment.js";
 
-export type DraftResponseDto = {
+export type SavePostResponseDto = {
   postId?: number;
   attachments: Attachment[];
 };
diff --git a/common/src/index.ts b/common/src/index.ts
index 96b0ea4..0103183 100644
--- a/common/src/index.ts
+++ b/common/src/index.ts
@@ -12,7 +12,7 @@ export * from "./dto/oauth/OAuthUserInfoDto.js";
 export * from "./dto/oauth/SavedOAuthToken.js";
 export * from "./dto/word.js";
 export * from "./entity/Attachment.js";
-export * from "./entity/DraftResponseDto.js";
+export * from "./entity/SavePostResponseDto.js";
 export * from "./entity/File.js";
 export * from "./entity/OAuthAccount.js";
 export * from "./entity/OAuthProvider.js";
diff --git a/server/src/entity/Post.entity.ts b/server/src/entity/Post.entity.ts
index 1b9c6e1..1c73c7f 100644
--- a/server/src/entity/Post.entity.ts
+++ b/server/src/entity/Post.entity.ts
@@ -53,4 +53,12 @@ export class PostEntity implements Post {
   })
   @JoinTable({ name: "post_tag", joinColumn: { name: "post_id" }, inverseJoinColumn: { name: "tag_id" } })
   tags: TagEntity[];
+
+  @JoinColumn({ name: "autosave_ref_post", referencedColumnName: "id", foreignKeyConstraintName: "post_autosave_ref_post_fk" })
+  @ManyToOne(() => PostEntity, (post) => post.id, { nullable: true })
+  autosaveRefPost?: PostEntity;
+
+  @JoinColumn({ name: "autosave_ref_user", referencedColumnName: "id", foreignKeyConstraintName: "post_autosave_ref_user_fk" })
+  @ManyToOne(() => UserEntity, (user) => user.id, { nullable: true })
+  autosaveRefUser?: UserEntity;
 }
diff --git a/server/src/migration/1684930338348-Autosave.ts b/server/src/migration/1684930338348-Autosave.ts
new file mode 100644
index 0000000..fde6694
--- /dev/null
+++ b/server/src/migration/1684930338348-Autosave.ts
@@ -0,0 +1,62 @@
+import { MigrationInterface, QueryRunner, TableColumn, TableForeignKey } from "typeorm";
+
+export class Autosave1684930338348 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.addColumn(
+      "post",
+      new TableColumn({
+        name: "autosave_ref_post",
+        type: "bigint",
+        isNullable: true,
+        isUnique: true,
+      }),
+    );
+    await queryRunner.createForeignKey(
+      "post",
+      new TableForeignKey({
+        name: "post_autosave_ref_post_fk",
+        columnNames: ["autosave_ref_post"],
+        referencedColumnNames: ["id"],
+        referencedTableName: "post",
+      }),
+    );
+    await queryRunner.addColumn(
+      "post",
+      new TableColumn({
+        name: "autosave_ref_user",
+        type: "bigint",
+        isNullable: true,
+        isUnique: true,
+      }),
+    );
+    await queryRunner.createForeignKey(
+      "post",
+      new TableForeignKey({
+        name: "post_autosave_ref_user_fk",
+        columnNames: ["autosave_ref_user"],
+        referencedColumnNames: ["id"],
+        referencedTableName: "user",
+      }),
+    );
+    await queryRunner.query("drop view search_posts");
+    await queryRunner.query(`
+      CREATE VIEW search_posts AS
+        (
+        select id as post_id,
+               setweight(to_tsvector(coalesce(title, '')), 'A') ||
+               setweight(to_tsvector(coalesce(description, '')), 'B') ||
+               setweight(to_tsvector(coalesce(markdown, '')), 'C') ||
+               setweight(to_tsvector(coalesce((select string_agg(name, ' ')
+                                               from tag t
+                                               where t.id in (select tag_id from post_tag where post_id = post.id)), '')), 'A')
+                  as post_tsv
+        from post
+        where post.autosave_ref_post is null and post.autosave_ref_user is null)
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.dropColumn("post", "autosave_ref");
+    await queryRunner.query("drop view search_posts");
+  }
+}
diff --git a/server/src/routes/posts.ts b/server/src/routes/posts.ts
index 3c8f3e0..d9f07ec 100644
--- a/server/src/routes/posts.ts
+++ b/server/src/routes/posts.ts
@@ -1,7 +1,7 @@
-import { DraftResponseDto, EditPostRequestDto, NewPostRequestDto, permissionsForUser, PostRequestDto } from "@fumix/fu-blog-common";
+import { EditPostRequestDto, NewPostRequestDto, permissionsForUser, PostRequestDto, SavePostResponseDto } from "@fumix/fu-blog-common";
 import { GoneError } from "../errors/GoneError.js";
 import express, { NextFunction, Request, Response, Router } from "express";
-import { In } from "typeorm";
+import { In, IsNull } from "typeorm";
 import { AppDataSource } from "../data-source.js";
 import { AttachmentEntity } from "../entity/Attachment.entity.js";
 import { FileEntity } from "../entity/File.entity.js";
@@ -16,6 +16,8 @@ import { MarkdownConverterServer } from "../markdown-converter-server.js";
 import { authMiddleware } from "../service/middleware/auth.js";
 import { extractJsonBody, extractUploadFiles, multipleFilesUpload } from "../service/middleware/files-upload.js";
 import { generateShareImage } from "../service/opengraph.js";
+import logger from "../logger.js";
+import { OAuthAccountEntity } from "@server/entity/OAuthAccount.entity.js";
 
 const router: Router = express.Router();
 
@@ -68,12 +70,17 @@ router.get("/page/:page([0-9]+)/count/:count([0-9]+)/", async (req: Request, res
   await AppDataSource.manager
     .getRepository(PostEntity)
     .findAndCount({
+      where: {
+        autosaveRefPost: IsNull(),
+        autosaveRefUser: IsNull(),
+        draft: false,
+      },
       order: {
         createdAt: "DESC",
       },
       skip: skipEntries,
       take: itemsPerPage,
-      relations: ["createdBy", "updatedBy", "tags"],
+      relations: ["createdBy", "updatedBy", "tags", "autosaveRefPost", "autosaveRefUser"],
     })
     .then((result) => res.status(200).json({ data: result }))
     .catch((error) => {
@@ -116,7 +123,7 @@ router.post(
   "/new",
   authMiddleware,
   multipleFilesUpload,
-  async (req: Request, res: Response<DraftResponseDto>, next: NextFunction): Promise<void> => {
+  async (req: Request, res: Response<SavePostResponseDto>, next: NextFunction): Promise<void> => {
     const body: NewPostRequestDto | undefined = JSON.parse(req.body?.json) as NewPostRequestDto;
     const loggedInUser = await req.loggedInUser?.();
 
@@ -137,7 +144,7 @@ router.post(
           .values(tags)
           .onConflict('("name") DO UPDATE SET "name" = EXCLUDED."name"')
           .execute()
-          .then(async (it): Promise<DraftResponseDto> => {
+          .then(async (it): Promise<SavePostResponseDto> => {
             const post: PostEntity = {
               title: body.title,
               description: body.description,
@@ -182,6 +189,61 @@ router.post(
   },
 );
 
+async function saveAutosave(
+  body: PostRequestDto,
+  postRef: PostEntity | undefined,
+  user: OAuthAccountEntity,
+  attachmentEntities: AttachmentEntity[],
+): Promise<SavePostResponseDto> {
+  return AppDataSource.manager.transaction(async (manager) => {
+    await manager.query("SET CONSTRAINTS ALL DEFERRED");
+    const tags = body.stringTags.map((name) => ({ name: name.trim() }));
+    return manager
+      .createQueryBuilder(TagEntity, "tag")
+      .insert()
+      .values(tags)
+      .onConflict('("name") DO UPDATE SET "name" = EXCLUDED."name"')
+      .execute()
+      .then(async (it): Promise<SavePostResponseDto> => {
+        const post: PostEntity = {
+          title: body.title,
+          description: body.description,
+          markdown: body.markdown,
+          createdBy: user.user,
+          createdAt: new Date(),
+          sanitizedHtml: await MarkdownConverterServer.Instance.convert(body.markdown),
+          draft: true,
+          attachments: [],
+          tags,
+          autosaveRefPost: postRef,
+        };
+
+        const insertResult = await manager.getRepository(PostEntity).insert(post);
+        await manager.createQueryBuilder(PostEntity, "tags").relation("tags").of(post).add(tags);
+        if (attachmentEntities.length > 0) {
+          await manager
+            .createQueryBuilder()
+            .insert()
+            .into(FileEntity)
+            .values(attachmentEntities.map((it) => it.file))
+            .onConflict('("sha256") DO NOTHING')
+            .execute();
+          return await manager
+            .getRepository(AttachmentEntity)
+            .insert(attachmentEntities)
+            .then((it) => {
+              return { postId: post.id, attachments: attachmentEntities };
+            });
+        } else {
+          return { postId: post.id, attachments: [] };
+        }
+      })
+      .catch((err) => {
+        throw new InternalServerError(true, "Could not create autosave " + err);
+      });
+  });
+}
+
 async function getPersistedTagsForPost(post: PostEntity, bodyJson: PostRequestDto): Promise<TagEntity[]> {
   if (!bodyJson.stringTags || bodyJson.stringTags.length <= 0) {
     return Promise.resolve([]);
@@ -232,10 +294,67 @@ router.get("/tags/:search", async (req: Request, res: Response, next) => {
     .catch(next);
 });
 
+// delete autosave
+router.delete("/autosave/:id(\\d+$)", authMiddleware, async (req: Request, res: Response, next) => {
+  const account = await req.loggedInUser?.();
+  if (!account) {
+    return next(new UnauthorizedError());
+  } else if (!permissionsForUser(account.user).canEditPost && account.user.id === null) {
+    return next(new ForbiddenError());
+  }
+  logger.info("Deleting autosave");
+  await deletePostEntity(+req.params.id)
+    .then((it) => res.sendStatus(200))
+    .catch(next);
+});
+
+// find any relevant autosave for the user
+router.get("/autosave", authMiddleware, async (req, res, next) => {
+  logger.info("Looking for user related autosaves...");
+  const account = await req.loggedInUser?.();
+  if (!account) {
+    return next(new UnauthorizedError());
+  } else if (!permissionsForUser(account.user).canEditPost && account.user.id === null) {
+    return next(new ForbiddenError());
+  }
+  await AppDataSource.manager
+    .getRepository("post")
+    .find({ where: { autosaveRefUser: account.user } })
+    .then((autosave) => res.status(200).send({ data: autosave }))
+    .catch(next);
+});
+
+// find any relevant autosave for the post
+router.get("/autosave/:id(\\d+$)", async (req, res, next) => {
+  if (+req.params.id) {
+    logger.info("Looking for post related autosaves..." + req.params.id);
+    await AppDataSource.manager
+      .getRepository("post")
+      .findOne({ where: { autosaveRefPost: { id: +req.params.id } } })
+      .then((autosave) => {
+        logger.info("found " + JSON.stringify(autosave));
+        return res.status(200).send({ data: autosave });
+      })
+      .catch(next);
+  }
+});
+
+// deletes autosaves referencing a post, if any
+async function deleteAnyAutosaveForPost(postId: number) {
+  return await AppDataSource.manager.getRepository("post").delete({ autosaveRefPost: postId });
+}
+
+// deletes autosaves referencing a user, if any
+async function deleteAnyAutosaveForUser(userId: number) {
+  return await AppDataSource.manager.getRepository("post").delete({ autosaveRefUser: userId });
+}
+
 // EDIT EXISTING POST
 router.post("/:id(\\d+$)", authMiddleware, multipleFilesUpload, async (req: Request, res: Response, next) => {
-  const postId = +req.params.id;
-  const post = await AppDataSource.manager.getRepository(PostEntity).findOneBy({
+  let shouldUpdate = true;
+  // first assume to edit the post
+  let postId: number = +req.params.id;
+  let post: PostEntity = await AppDataSource.manager.getRepository(PostEntity).findOneByOrFail({
     id: postId,
   });
 
@@ -253,60 +372,125 @@ router.post("/:id(\\d+$)", authMiddleware, multipleFilesUpload, async (req: Requ
     return next(new ForbiddenError());
   }
 
+  const postPartial = {
+    title: body.title,
+    description: body.description,
+    markdown: body.markdown,
+    updatedAt: new Date(),
+    sanitizedHtml: await MarkdownConverterServer.Instance.convert(body.markdown),
+    updatedBy: account.user,
+    draft: body.draft,
+  };
+
   const tagsToUseInPost: TagEntity[] = await getPersistedTagsForPost(post, body).catch((err) => {
     throw new InternalServerError(true, "Error getting tags" + err);
   });
 
-  AppDataSource.manager
-    .transaction(async (manager) => {
-      manager
-        .getRepository(PostEntity)
-        .update(postId, {
-          title: body.title,
-          description: body.description,
-          markdown: body.markdown,
-          updatedAt: new Date(),
-          sanitizedHtml: await MarkdownConverterServer.Instance.convert(body.markdown),
-          updatedBy: account.user,
-          draft: body.draft,
-          // tags: tagsToUseInPost,
+  // TODO: do this correctly
+  let entityToUpdate: Promise<PostEntity>;
+
+  if (body.autosave) {
+    const attachmentEntities: AttachmentEntity[] = await Promise.all(extractUploadFiles(req).map((it) => convertAttachment(post, it)));
+
+    findAnyAutosaveForPost(postId)
+      .then((foundAutosave) => {
+        if (foundAutosave) {
+          // so that later we update the autosave entity instead of the post itself
+          post = foundAutosave;
+          postId = Number(foundAutosave.id);
+          // TODO : avoid saving before this is set -> async
+          entityToUpdate = new Promise((resolve) => post);
+        } else {
+          // no autosave found for post -> create a new autosave
+          shouldUpdate = false;
+          saveAutosave(body, post, account, attachmentEntities)
+            .then((response) => res.status(201).json(response))
+            .catch(next);
+          entityToUpdate = Promise.reject();
+        }
+      })
+      .catch(next);
+  } else {
+    entityToUpdate = new Promise<PostEntity>((resolve) => post);
+  }
+
+  Promise.resolve(entityToUpdate).then(() => {
+    // only relevant if post or autosave entity should be updated
+    if (shouldUpdate && post) {
+      // update post or autosave
+      AppDataSource.manager
+        .transaction(async (manager) => {
+          manager
+            .getRepository(PostEntity)
+            .update(postId, postPartial)
+            .then((updateResult) => {
+              // TODO: Optimize, so unchanged attachments are not deleted and re-added
+              manager.getRepository(AttachmentEntity).delete({ post: { id: post.id } });
+              // manager.getRepository(AttachmentEntity).insert(extractUploadFiles(req).map((it) => convertAttachment(post, it)));
+              // tagsToUseInPost.forEach((tag) => {
+              //   manager.getRepository(PostEntity).createQueryBuilder().relation(PostEntity, "tags").add(tag);
+              // });
+            })
+            .catch(next);
+          // many to many cant be updated so we have to save again
+          return manager
+            .getRepository(PostEntity)
+            .findOneByOrFail({ id: postId })
+            .then((post) => {
+              post.tags = tagsToUseInPost;
+              return post;
+            })
+            .then((updatedPost) => manager.getRepository(PostEntity).save(updatedPost))
+            .catch(next);
         })
-        .then((updateResult) => {
-          // TODO: Optimize, so unchanged attachments are not deleted and re-added
-          manager.getRepository(AttachmentEntity).delete({ post: { id: post.id } });
-          // manager.getRepository(AttachmentEntity).insert(extractUploadFiles(req).map((it) => convertAttachment(post, it)));
-          // tagsToUseInPost.forEach((tag) => {
-          //   manager.getRepository(PostEntity).createQueryBuilder().relation(PostEntity, "tags").add(tag);
-          // });
+        .then((it) => {
+          if (post.id && !body.autosave) {
+            deleteAnyAutosaveForPost(post.id);
+          }
+          return res.status(200).json({ postId: post.id } as SavePostResponseDto);
         })
         .catch(next);
-      // many to many cant be updated so we have to save again
-      return manager
-        .getRepository(PostEntity)
-        .findOneByOrFail({ id: postId })
-        .then((post) => {
-          post.tags = tagsToUseInPost;
-          return post;
-        })
-        .then((updatedPost) => manager.getRepository(PostEntity).save(updatedPost))
+    }
+  });
+});
+
+// DELETE POST
+router.delete("/:id(\\d+$)", authMiddleware, async (req: Request, res: Response, next) => {
+  // first delete possible autosave referencing the post
+  findAnyAutosaveForPost(+req.params.id)
+    .then((found) => {
+      if (found?.id) {
+        logger.info("deleting found autosave");
+        deletePostEntity(found.id);
+      }
+    })
+    .then(() => {
+      // then the actual post
+      logger.info("deleting found post");
+      deletePostEntity(+req.params.id)
+        .then((post) => res.sendStatus(200))
         .catch(next);
     })
-    .then((it) => res.status(200).json({ postId: post.id } as DraftResponseDto))
     .catch(next);
 });
 
-// DELETE POST
-router.get("/delete/:id(\\d+$)", async (req: Request, res: Response, next) => {
+// returns any autosave referencing the post with the given postId
+const findAnyAutosaveForPost = async (postId: number) => {
+  return await AppDataSource.manager.findOne(PostEntity, { where: { autosaveRefPost: { id: postId } } }).catch(() => Promise.resolve());
+};
+
+// deletes a PostEntity. Autosaves referencing must be deleted prior.
+const deletePostEntity = async (postId: number) => {
   await AppDataSource.manager.transaction(async (manager) => {
     // find all attachments of post and delete them
-    await manager.getRepository(AttachmentEntity).delete({ post: { id: +req.params.id } });
+    await manager.getRepository(AttachmentEntity).delete({ post: { id: postId } });
 
     // cannot simply delete a post cause of the fk_constraint to tags (many_to_many)
     // hence we have to find the post, detach the tags
     // then again save it without tags
     // then delete it.
 
-    const post = await manager.findOne(PostEntity, { where: { id: +req.params.id }, relations: { tags: true } });
+    const post = await manager.findOne(PostEntity, { where: { id: postId }, relations: { tags: true } });
 
     // TODO: find a better way than detach-save-delete, maybe with cascade migration ?
     // Don't know why orphanedRowAction: "delete" is not working here ... orphaned rows still remain in tag table
@@ -314,10 +498,9 @@ router.get("/delete/:id(\\d+$)", async (req: Request, res: Response, next) => {
       post.tags = []; // detach constraint
       await manager.save(post);
     }
-    await manager.getRepository(PostEntity).delete(+req.params.id);
-    res.status(200).send(post);
+    await manager.getRepository(PostEntity).delete(postId);
   });
-});
+};
 
 router.get("/:id(\\d+)/og-image", async (req: Request, res: Response, next) => {
   AppDataSource.getRepository(PostEntity)
diff --git a/server/src/service/testdata-generator.ts b/server/src/service/testdata-generator.ts
index 872f6c8..9db4ff9 100644
--- a/server/src/service/testdata-generator.ts
+++ b/server/src/service/testdata-generator.ts
@@ -35,6 +35,22 @@ export async function initDatabase(): Promise<void> {
   logger.info("Database initialized");
 }
 
+export async function createRandomAutosave(post: PostEntity): Promise<PostEntity> {
+  try {
+    // save some autosaves
+    if (faker.datatype.boolean({ probability: 0.25 })) {
+      const clone = structuredClone(post) as PostEntity;
+      clone.autosaveRefPost = post;
+      clone.id = undefined;
+      clone.title = "Autosave";
+      return await AppDataSource.manager.getRepository(PostEntity).save(clone);
+    }
+  } catch (e) {
+    logger.error("Error creating autosave", e);
+  }
+  return new Promise(() => null);
+}
+
 /**
  * Generate some test data for the blog.
  */
@@ -50,6 +66,7 @@ async function generate(): Promise<void> {
         createRandomFakeOauthAccount(user, faker.datatype.number());
         Array.from({ length: postsPerUser }).forEach(() => {
           createRandomPost(user, faker.datatype.number()).then((post: PostEntity) => {
+            createRandomAutosave(post);
             Array.from({ length: attachmentsPerPost }).forEach(() => {
               createRandomAttachment(post, faker.datatype.number());
             });