diff --git a/include/text.php b/include/text.php
index 2d1bc4222..224ba17d0 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1459,8 +1459,10 @@ function format_hashtags(&$item) {
 				continue;
 			if(strpos($item['body'], $t['url']))
 				continue;
+			if($s)
+				$s .= ' ';
 
-			$s .= '<span class="badge badge-pill badge-info"><i class="fa fa-hashtag"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span> ';
+			$s .= '<span class="badge badge-pill badge-info"><i class="fa fa-hashtag"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span>';
 		}
 	}
 
@@ -1480,8 +1482,9 @@ function format_mentions(&$item) {
 				continue;
 			if(strpos($item['body'], $t['url']))
 				continue;
-
-			$s .= '<span class="badge badge-pill badge-success"><i class="fa fa-at"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span> ';
+			if($s)
+				$s .= ' ';
+			$s .= '<span class="badge badge-pill badge-success"><i class="fa fa-at"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span>';
 		}
 	}
 
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 6f42521ae..1868f926d 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -58,7 +58,7 @@
 				<div class="p-2 wall-item-tools clearfix">
 
 					<div class="body-tags">
-						<span class="tag">{{$item.mentions}}{{$item.tags}}{{$item.categories}}</span>
+						<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}}</span>
 					</div>
 				{{**
 					{{if $item.mentions}}