diff --git a/files/assets/js/core.js b/files/assets/js/core.js
index c243e61bf3..4fe7278d2f 100644
--- a/files/assets/js/core.js
+++ b/files/assets/js/core.js
@@ -508,23 +508,12 @@ function handle_files(input, newfiles) {
 
 	autoExpand(ta)
 
-	if (typeof checkForRequired === "function") checkForRequired();
-
-	if (location.pathname.endsWith('/submit')) {
-		files_b64 = JSON.parse(localStorage.getItem("files_b64")) || [];
-		for (const file of newfiles) {
-			if (!file.type.startsWith('image/'))
-				continue
-			fileReader = new FileReader();
-			fileReader.onload = function () {
-				files_b64.push([file.name, file.type, this.result]);
-				localStorage.setItem("files_b64", JSON.stringify(files_b64));
-				savetext()
-			};
-			fileReader.filename = file.name
-			fileReader.readAsDataURL(file);
-		}
-	}
+	if (typeof checkForRequired === "function") 
+		checkForRequired();
+	if (typeof savetext === "function") 
+		savetext();
+	if (typeof submit_save_files === "function")
+		submit_save_files("textarea", newfiles);
 }
 
 
@@ -541,8 +530,6 @@ if (file_upload) {
 				fileReader.readAsDataURL(file_upload.files[0]);
 				fileReader.onload = function () {
 					document.getElementById('image-preview').setAttribute('src', this.result);
-					const str = JSON.stringify([file.name, file.type, this.result])
-					localStorage.setItem("attachment_b64", str);
 					document.getElementById('image-preview').classList.remove('d-none');
 					document.getElementById('image-preview').classList.add('mr-2');
 					document.getElementById('image-preview').nextElementSibling.classList.add('mt-3');
@@ -561,6 +548,10 @@ if (file_upload) {
 			else {
 				document.getElementById('submit-btn').disabled = false;
 			}
+
+			if (typeof submit_save_files === "function") {
+				submit_save_files("attachment", [file]);
+			}
 		}
 	}
 	file_upload.onchange = process_url_image
diff --git a/files/assets/js/submit.js b/files/assets/js/submit.js
index a7cdf6c921..a4acadf046 100644
--- a/files/assets/js/submit.js
+++ b/files/assets/js/submit.js
@@ -197,8 +197,7 @@ function submit(form) {
 					localStorage.setItem(id, value)
 				}
 
-				localStorage.removeItem("attachment_b64")
-				localStorage.removeItem("files_b64")
+				clear_files()
 			}
 
 			location.href = "/post/" + post_id
@@ -220,36 +219,98 @@ function submit(form) {
 	xhr.send(formData);
 }
 
-async function array_to_file(array) {
-	const res = await fetch(array[2]);
-	const blob = await res.blob();
-	return new File([blob], array[0], {type: array[1]});
+
+
+
+
+
+
+
+//SAVE FILES
+
+const indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB || window.shimIndexedDB;
+
+const open = indexedDB.open("files", 1);
+
+open.onupgradeneeded = () => {
+	const db = open.result;
+	db.createObjectStore("files", {keyPath:"kind"});
+	db.close();
 }
 
-async function restore_attachment() {
-	const array = JSON.parse(localStorage.getItem("attachment_b64"))
-	if (!array) return
+function submit_save_files(kind, files) {
+	const open = indexedDB.open("files", 1);
+	open.onsuccess = () => {
+		const db = open.result;
+		const tx = db.transaction("files", "readwrite");
+		const store = tx.objectStore("files");
 
-	const list = new DataTransfer();
-	const file = await array_to_file(array)
-	list.items.add(file);
+		tx.oncomplete = () => {
+			db.close();
+		};
 
-	document.getElementById("file-upload").files = list.files
-	process_url_image()
-}
-
-async function restore_files() {
-	oldfiles["post-text"] = []
-	const files_b64_get = JSON.parse(localStorage.getItem("files_b64"))
-	if (!files_b64_get) return
-	const list = new DataTransfer();
-	for (const array of files_b64_get) {
-		const file = await array_to_file(array)
-		list.items.add(file);
-		oldfiles["post-text"].push(file)
+		store.put({kind:kind, files:files});
 	}
-	document.getElementById("file-upload-submit").files = list.files
 }
 
-restore_attachment()
-restore_files()
+
+//RESTORE FILES
+
+function submit_restore_files(kind, id) {
+	const open = indexedDB.open("files", 1);
+	open.onsuccess = () => {
+		const db = open.result;
+		const tx = db.transaction("files", "readwrite");
+		const store = tx.objectStore("files");
+
+		tx.oncomplete = () => {
+			db.close();
+		};
+
+		const get_files = store.get(kind);
+
+		get_files.onsuccess = () => {
+			let files = get_files.result
+			if (!files) return
+			files = files.files
+
+			const list = new DataTransfer();
+			for (const file of files) {
+				list.items.add(file);
+			}
+
+			document.getElementById(id).files = list.files
+
+			if (kind == "attachment") {
+				process_url_image()
+			}
+			else {
+				oldfiles["post-text"] = new DataTransfer();
+				for (const file of files) {
+					oldfiles["post-text"].items.add(file);
+				}	
+			}
+		};
+	}
+}
+
+submit_restore_files("attachment", "file-upload")
+submit_restore_files("textarea", "file-upload-submit")
+
+
+//CLEAR FILES
+
+function clear_files() {
+	const open = indexedDB.open("files", 1);
+	open.onsuccess = () => {
+		const db = open.result;
+		const tx = db.transaction("files", "readwrite");
+		const store = tx.objectStore("files");
+
+		tx.oncomplete = () => {
+			db.close();
+		};
+
+		store.clear();
+	}
+}