diff --git a/src/Views/post-edit.phtml b/src/Views/post-edit.phtml
new file mode 100644
index 00000000..dac63efd
--- /dev/null
+++ b/src/Views/post-edit.phtml
@@ -0,0 +1,43 @@
+<form action="<?php echo \Chibi\UrlHelper::route('post', 'edit', ['id' => $this->context->transport->post->id]) ?>" method="post" enctype="multipart/form-data" class="edit-post aligned unit">
+	<h1>edit post</h1>
+	<?php if (PrivilegesHelper::confirm(Privilege::EditPostSafety, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->post->uploader))): ?>
+		<div class="safety">
+			<label class="left">Safety:</label>
+			<?php foreach (PostSafety::getAll() as $safety): ?>
+				<label>
+					<input type="radio" name="safety" value="<?php echo $safety ?>" <?php if ($this->context->transport->post->safety == $safety) echo 'checked="checked"' ?>/>
+					&nbsp;<?php echo TextHelper::camelCaseToHumanCase(PostSafety::toString($safety), true) ?>
+				</label>
+			<?php endforeach ?>
+		</div>
+	<?php endif ?>
+
+	<?php if (PrivilegesHelper::confirm(Privilege::EditPostTags, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->post->uploader))): ?>
+		<div class="tags">
+			<label class="left" for="tags">Tags:</label>
+			<div class="input-wrapper"><input type="text" name="tags" id="tags" placeholder="enter some tags&hellip;" value="<?php echo join(',', array_map(function($tag) { return $tag->name; }, $this->context->transport->post->sharedTag)) ?>"/></div>
+		</div>
+		<input type="hidden" name="tags-token" id="tags-token" value="<?php echo $this->context->transport->tagsToken ?>"/>
+	<?php endif ?>
+
+	<?php if (PrivilegesHelper::confirm(Privilege::EditPostSource, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->post->uploader))): ?>
+		<div class="source">
+			<label class="left" for="source">Source:</label>
+			<div class="input-wrapper"><input type="text" name="source" id="source" value="<?php echo $this->context->transport->post->source ?>"/></div>
+		</div>
+	<?php endif ?>
+
+	<?php if (PrivilegesHelper::confirm(Privilege::EditPostThumb, PrivilegesHelper::getIdentitySubPrivilege($this->context->transport->post->uploader))): ?>
+		<div class="thumb">
+			<label class="left" for="thumb">Thumb:</label>
+			<div class="input-wrapper"><input type="file" name="thumb" id="thumb"/></div>
+		</div>
+	<?php endif ?>
+
+	<input type="hidden" name="submit" value="1"/>
+
+	<div>
+		<label class="left">&nbsp;</label>
+		<button type="submit">Submit</button>
+	</div>
+</form>
diff --git a/src/Views/post-view.phtml b/src/Views/post-view.phtml
index 42832a90..f88efb4a 100644
--- a/src/Views/post-view.phtml
+++ b/src/Views/post-view.phtml
@@ -216,49 +216,7 @@
 	</div>
 
 	<?php if ($canEditAnything): ?>
-		<form action="<?php echo \Chibi\UrlHelper::route('post', 'edit', ['id' => $this->context->transport->post->id]) ?>" method="post" enctype="multipart/form-data" class="edit-post aligned unit">
-			<h1>edit post</h1>
-			<?php if ($editPostPrivileges[Privilege::EditPostSafety]): ?>
-				<div class="safety">
-					<label class="left">Safety:</label>
-					<?php foreach (PostSafety::getAll() as $safety): ?>
-						<label>
-							<input type="radio" name="safety" value="<?php echo $safety ?>" <?php if ($this->context->transport->post->safety == $safety) echo 'checked="checked"' ?>/>
-							&nbsp;<?php echo TextHelper::camelCaseToHumanCase(PostSafety::toString($safety), true) ?>
-						</label>
-					<?php endforeach ?>
-				</div>
-			<?php endif ?>
-
-			<?php if ($editPostPrivileges[Privilege::EditPostTags]): ?>
-				<div class="tags">
-					<label class="left" for="tags">Tags:</label>
-					<div class="input-wrapper"><input type="text" name="tags" id="tags" placeholder="enter some tags&hellip;" value="<?php echo join(',', array_map(function($tag) { return $tag->name; }, $this->context->transport->post->sharedTag)) ?>"/></div>
-				</div>
-				<input type="hidden" name="tags-token" id="tags-token" value="<?php echo $this->context->transport->tagsToken ?>"/>
-			<?php endif ?>
-
-			<?php if ($editPostPrivileges[Privilege::EditPostSource]): ?>
-				<div class="source">
-					<label class="left" for="source">Source:</label>
-					<div class="input-wrapper"><input type="text" name="source" id="suorce" value="<?php echo $this->context->transport->post->source ?>"/></div>
-				</div>
-			<?php endif ?>
-
-			<?php if ($editPostPrivileges[Privilege::EditPostThumb]): ?>
-				<div class="thumb">
-					<label class="left" for="thumb">Thumb:</label>
-					<div class="input-wrapper"><input type="file" name="thumb" id="thumb"/></div>
-				</div>
-			<?php endif ?>
-
-			<input type="hidden" name="submit" value="1"/>
-
-			<div>
-				<label class="left">&nbsp;</label>
-				<button type="submit">Submit</button>
-			</div>
-		</form>
+		<?php $this->renderFile('post-edit') ?>
 	<?php endif ?>
 
 	<div class="comments unit">