diff --git a/modules/timeline.php b/modules/timeline.php
index a8cb832..a61b92d 100644
--- a/modules/timeline.php
+++ b/modules/timeline.php
@@ -333,12 +333,12 @@ if ((!isset($thread[0]['id']) && !empty($thread)) || !is_array($thread)) {
 			}
 		}
 
-		//if ((empty($elem['media_attachments']) && $post['media'] == "") || (!(empty($elem['media_attachments']) && $post['media'] == "") && $user_settings['attach'] == "off")) {
-			//$post['template'] = themes("get","templates/textpost.txt");
-		//}
-		//else {
+		if ((empty($elem['media_attachments']) && $post['media'] == "") || (!(empty($elem['media_attachments']) && $post['media'] == "") && $user_settings['attach'] == "off")) {
+			$post['template'] = themes("get","templates/textpost.txt");
+		}
+		else {
 			$post['template'] = themes("get","templates/post.txt");
-		//}
+		}
 
 		foreach ($post as $key => $value) {
 			$post['template'] = str_replace(":$key:", $value, $post['template']);
diff --git a/templates/textpost.txt b/templates/textpost.txt
index a41ff26..6f07178 100644
--- a/templates/textpost.txt
+++ b/templates/textpost.txt
@@ -1,23 +1,20 @@
 <div class='element'>
-	<div class='avatar' style='height:1px;'></div>
-	<div class='post textonly' id=':id:' pid=':pid:'>
+	<div class='avatar' style='background-image:url(:avatar:) :style:'></div>
+	<div class='post' id=':id:' pid=':pid:'>
 		<div id='a:id:' class='ancestors'>:ancestors:</div>
 		<div class='postHeader'>
-			<span style='margin:5px; display:block; float:left;'>
-				<img src=':avatar:' width=30 style='vertical-align:middle; border-radius:30px;'> 
-				:name: :rt:
-			</span> 
+			<span style='margin:5px; display:block; float:left; line-height:30px;'><img src=':avatar:' width=30 class='mobile' style='vertical-align:middle; border-radius:30px'> :name: :rt: </span>
 			<span style="margin-top:12px; margin-right:10px; float:right; display:block;">
 				<span class='postMenu fontello'>&#xf0c9;<div style='display:none; z-index:99; width:130px; position: absolute; top: 15px; right: -1px;' class='menu'>:menu:</div></span>
 			</span>
 		</div>
-		<div class='postbody'>
-			<div class='content' style='margin-bottom:5px; margin-top:5px;'>:spoiler: :replyto: :text:</div>
-		</div>
-		<div class='post_footer'>:footer:</div>
+		:spoiler:
+		<div class='postbody'><div class='content' style='margin-bottom:5px;'>
+		:replyto: :text:
+		</div></div>
+		<div class='post_footer'>:footer:</DIV>
 		<div class='post_notes'>:notes:</DIV>
-		<div id=':id:' class='replies_container'>:descendants:</div>
+		<div id=':id:' class='replies_container'><noscript>:form:</noscript>:descendants:</div>
 	</div>
 	<script type='application/json' id='data-:id:'>:json:</script>
 </div>
-