diff --git a/public/language/en_GB/topic.json b/public/language/en_GB/topic.json
index f177725d56..e38f4b1d84 100644
--- a/public/language/en_GB/topic.json
+++ b/public/language/en_GB/topic.json
@@ -36,6 +36,18 @@
 
 	"flag_title": "Flag this post for moderation",
 	"flag_success": "This post has been flagged for moderation.",
+	"flag_manage_title": "Flagged post in %1",
+	"flag_manage_history": "Action History",
+	"flag_manage_no_history": "No event history to report",
+	"flag_manage_assignee": "Assignee",
+	"flag_manage_state": "State",
+	"flag_manage_state_open": "New/Open",
+	"flag_manage_state_wip": "Work in Progress",
+	"flag_manage_state_resolved": "Resolved",
+	"flag_manage_state_rejected": "Rejected",
+	"flag_manage_notes": "Shared Notes",
+	"flag_manage_update": "Update Flag Status",
+
 	"deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
 
 	"following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
diff --git a/src/views/admin/manage/flags.tpl b/src/views/admin/manage/flags.tpl
index 1bd1726b97..1e12d5c51a 100644
--- a/src/views/admin/manage/flags.tpl
+++ b/src/views/admin/manage/flags.tpl
@@ -44,7 +44,7 @@
 
 		<div data-next="{next}">
 
-			<div class="post-container" data-next="{next}">
+			<div class="panel-group post-container" id="accordion" role="tablist" aria-multiselectable="true" data-next="{next}">
 				<!-- IF !posts.length -->
 				<div class="alert alert-success">
 					No flagged posts!
@@ -52,54 +52,100 @@
 				<!-- ENDIF !posts.length -->
 
 				<!-- BEGIN posts -->
-				<div class="row" data-pid="{posts.pid}" data-tid="{posts.topic.tid}">
-					<div class="col-sm-8">
-						<div class="panel panel-default">
-							<div class="panel-body flag-post-body">
-								<a href="{config.relative_path}/user/{../user.userslug}">
-									<!-- IF ../user.picture -->
-									<img title="{posts.user.username}" src="{../user.picture}">
-									<!-- ELSE -->
-									<div class="user-icon" style="background-color: {../user.icon:bgColor};">{../user.icon:text}</div>
-									<!-- ENDIF ../user.picture -->
-								</a>
-
-								<a href="{config.relative_path}/user/{../user.userslug}">
-									<strong><span>{../user.username}</span></strong>
-								</a>
-								<div class="content">
-									<p>{posts.content}</p>
-								</div>
-								<small>
-									<span class="pull-right">
-										Posted in <a href="{config.relative_path}/category/{posts.category.slug}" target="_blank"><i class="fa {posts.category.icon}"></i> {posts.category.name}</a>, <span class="timeago" title="{posts.timestampISO}"></span> &bull;
-										<a href="{config.relative_path}/topic/{posts.topic.slug}/{posts.index}" target="_blank">Read More</a>
-									</span>
-								</small>
-							</div>
-						</div>
+				<div class="panel panel-default">
+					<div class="panel-heading" role="tab">
+						<h4 class="panel-title">
+							<a role="button" data-toggle="collapse" data-parent="#accordion" href="#flag-pid-{posts.pid}" aria-expanded="true" aria-controls="flag-pid-{posts.pid}">
+								<span class="label <!-- IF ../flag.labelClassName -->{../flag.labelClassName}<!-- ELSE -->label-info<!-- ENDIF ../flag.labelClassName -->">[[topic:flag_manage_state_<!-- IF ../flag.state -->{../flag.state}<!-- ELSE -->open<!-- ENDIF ../flag.state -->]]</span>
+								&nbsp;[[topic:flag_manage_title, {posts.category.name}]]
+								<small><span class="timeago" title="{posts.timestampISO}"></span></small>
+							</a>
+						</h4>
 					</div>
-					<div class="col-sm-4">
-						<i class="fa fa-flag"></i> This post has been flagged {posts.flags} time(s):
-						<blockquote class="flag-reporters">
-							<ul>
-								<!-- BEGIN posts.flagReasons -->
-								<li>
-									<a target="_blank" href="{config.relative_path}/user/{../user.userslug}">
-										<!-- IF ../user.picture -->
-										<img src="{../user.picture}" />
-										<!-- ELSE -->
-										<div class="user-icon" style="background-color: {../user.icon:bgColor};">{../user.icon:text}</div>
-										<!-- ENDIF ../user.picture -->
-										{../user.username}
-									</a>: "{../reason}"
-								</li>
-								<!-- END posts.flagReasons -->
-							</ul>
-						</blockquote>
-						<div class="btn-group">
-							<button class="btn btn-sm btn-success dismiss">Dismiss this Flag</button>
-							<button class="btn btn-sm btn-danger delete">Delete the Post</button>
+					<div id="flag-pid-{posts.pid}" class="panel-collapse collapse<!-- IF @first --> in<!-- ENDIF @first -->" role="tabpanel">
+						<div class="panel-body">
+							<div class="row" data-pid="{posts.pid}" data-tid="{posts.topic.tid}">
+								<div class="col-sm-8">
+									<div class="well flag-post-body">
+										<a href="{config.relative_path}/user/{../user.userslug}">
+											<!-- IF ../user.picture -->
+											<img title="{posts.user.username}" src="{../user.picture}">
+											<!-- ELSE -->
+											<div class="user-icon" style="background-color: {../user.icon:bgColor};">{../user.icon:text}</div>
+											<!-- ENDIF ../user.picture -->
+										</a>
+
+										<a href="{config.relative_path}/user/{../user.userslug}">
+											<strong><span>{../user.username}</span></strong>
+										</a>
+										<div class="content">
+											<p>{posts.content}</p>
+										</div>
+										<small>
+											<span class="pull-right">
+												Posted in <a href="{config.relative_path}/category/{posts.category.slug}" target="_blank"><i class="fa {posts.category.icon}"></i> {posts.category.name}</a>, <span class="timeago" title="{posts.timestampISO}"></span> &bull;
+												<a href="{config.relative_path}/topic/{posts.topic.slug}/{posts.index}" target="_blank">Read More</a>
+											</span>
+										</small>
+									</div>
+								</div>
+								<div class="col-sm-4">
+									<i class="fa fa-flag"></i> This post has been flagged {posts.flags} time(s):
+									<blockquote class="flag-reporters">
+										<ul>
+											<!-- BEGIN posts.flagReasons -->
+											<li>
+												<a target="_blank" href="{config.relative_path}/user/{../user.userslug}">
+													<!-- IF ../user.picture -->
+													<img src="{../user.picture}" />
+													<!-- ELSE -->
+													<div class="user-icon" style="background-color: {../user.icon:bgColor};">{../user.icon:text}</div>
+													<!-- ENDIF ../user.picture -->
+													{../user.username}
+												</a>: "{../reason}"
+											</li>
+											<!-- END posts.flagReasons -->
+										</ul>
+									</blockquote>
+									<div class="btn-group">
+										<button class="btn btn-sm btn-success dismiss">Dismiss this Flag</button>
+										<button class="btn btn-sm btn-danger delete">Delete the Post</button>
+									</div>
+								</div>
+							</div>
+							<hr />
+							<div class="row">
+								<div class="col-sm-6">
+									<form role="form">
+										<div class="form-group">
+											<label for="{../pid}-assignee">[[topic:flag_manage_assignee]]</label>
+											<select class="form-control" id="{../pid}-assignee" name="assignee">
+												<option value="2">julian</option>
+											</select>
+										</div>
+										<div class="form-group">
+											<label for="{../pid}-state">[[topic:flag_manage_state]]</label>
+											<select class="form-control" id="{../pid}-state" name="state">
+												<option value="open">[[topic:flag_manage_state_open]]</option>
+												<option value="wip">[[topic:flag_manage_state_wip]]</option>
+												<option value="resolved">[[topic:flag_manage_state_resolved]]</option>
+												<option value="rejected">[[topic:flag_manage_state_rejected]]</option>
+											</select>
+										</div>
+										<div class="form-group">
+											<label for="{../pid}-notes">[[topic:flag_manage_notes]]</label>
+											<textarea class="form-control" id="{../pid}-notes" name="notes"></textarea>
+										</div>
+										<button class="btn btn-sm btn-primary btn-block">[[topic:flag_manage_update]]</button>
+									</form>
+								</div>
+								<div class="col-sm-6">
+									<h5>[[topic:flag_manage_history]]</h5>
+									<!-- IF !../flagHistory.length -->
+									<div class="alert alert-info">[[topic:flag_manage_no_history]]</div>
+									<!-- ENDIF !../flagHistory.length -->
+								</div>
+							</div>
 						</div>
 					</div>
 				</div>