diff --git a/simplicity/template/ucp_pm_viewmessage.html b/simplicity/template/ucp_pm_viewmessage.html
index b186803..261c67c 100644
--- a/simplicity/template/ucp_pm_viewmessage.html
+++ b/simplicity/template/ucp_pm_viewmessage.html
@@ -36,7 +36,7 @@
 		</dt>
 
 		<!-- EVENT ucp_pm_viewmessage_rank_before -->
-		<!-- IF RANK_TITLE or RANK_IMG --><dd class="profile-rank">{RANK_TITLE}<!-- IF RANK_TITLE and RANK_IMG --><br /><!-- ENDIF -->{RANK_IMG}</dd><!-- ENDIF -->
+		<!-- IF RANK_TITLE or RANK_IMG --><dd class="profile-rank"><!-- IF RANK_IMG -->{RANK_IMG}<!-- ELSE -->{RANK_TITLE}<!-- ENDIF --></dd><!-- ENDIF -->
 		<!-- EVENT ucp_pm_viewmessage_rank_after -->
 
 		<dd class="profile-posts"><strong>{L_POSTS}{L_COLON}</strong> <!-- IF U_AUTHOR_POSTS != '' --><a href="{U_AUTHOR_POSTS}">{AUTHOR_POSTS}</a><!-- ELSE -->{AUTHOR_POSTS}<!-- ENDIF --></dd>
diff --git a/simplicity/template/viewtopic_body.html b/simplicity/template/viewtopic_body.html
index 725ef0c..872e9fd 100644
--- a/simplicity/template/viewtopic_body.html
+++ b/simplicity/template/viewtopic_body.html
@@ -168,7 +168,7 @@
 			</dt>
 
 			<!-- EVENT viewtopic_body_postrow_rank_before -->
-			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd class="profile-rank">{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF -->
+			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd class="profile-rank"><!-- IF postrow.RANK_IMG -->{postrow.RANK_IMG}<!-- ELSE -->{postrow.RANK_TITLE}<!-- ENDIF --></dd><!-- ENDIF -->
 			<!-- EVENT viewtopic_body_postrow_rank_after -->
 
 		<!-- IF postrow.POSTER_POSTS != '' --><dd class="profile-posts"><strong>{L_POSTS}{L_COLON}</strong> <!-- IF postrow.U_SEARCH !== '' --><a href="{postrow.U_SEARCH}"><!-- ENDIF -->{postrow.POSTER_POSTS}<!-- IF postrow.U_SEARCH !== '' --></a><!-- ENDIF --></dd><!-- ENDIF -->