diff --git a/templates/composer.tpl b/templates/composer.tpl
index b9def46..b178a01 100644
--- a/templates/composer.tpl
+++ b/templates/composer.tpl
@@ -15,11 +15,19 @@
 				<input class="handle form-control" type="text" tabindex="1" placeholder="[[topic:composer.handle_placeholder]]" value="{handle}" />
 			</div>
 			<div class="col-sm-9 col-md-12">
-				<input class="title form-control" type="text" tabindex="2" placeholder="[[topic:composer.title_placeholder]]" />
+				<!-- IF isTopicOrMain -->
+				<input class="title form-control" type="text" tabindex="1" placeholder="[[topic:composer.title_placeholder]]" />
+				<!-- ELSE -->
+				<span class="title form-control">[[topic:composer.replying_to, "{title}"]]</span>
+				<!-- ENDIF isTopicOrMain -->
 			</div>
 			<!-- ELSE -->
 			<div class="<!-- IF isTopic -->col-lg-9<!-- ELSE -->col-lg-12<!-- ENDIF isTopic --> col-md-12">
+				<!-- IF isTopicOrMain -->
 				<input class="title form-control" type="text" tabindex="1" placeholder="[[topic:composer.title_placeholder]]" />
+				<!-- ELSE -->
+				<span class="title form-control">[[topic:composer.replying_to, "{title}"]]</span>
+				<!-- ENDIF isTopicOrMain -->
 			</div>
 			<!-- IF isTopic -->
 			<div class="category-list-container col-lg-3 col-md-12">
@@ -102,11 +110,11 @@
 					<!-- ENDIF !isEditing -->
 				</div>
 
-				<!-- IF showTags -->
+				<!-- IF isTopicOrMain -->
 				<div class="tags-container inline-block">
 					<input class="tags" type="text" class="form-control" placeholder="[[tags:enter_tags_here, {minimumTagLength}, {maximumTagLength}]]" tabindex="4"/>
 				</div>
-				<!-- ENDIF showTags -->
+				<!-- ENDIF isTopicOrMain -->
 			</div>
 		</div>