diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
index d6a4f84c4..cbeb80a5f 100644
--- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
@@ -145,13 +145,17 @@ class plugin_forum_view_shortcodes extends e_shortcode
 			
 			if(count($images))
 			{
-				return (deftrue('BOOTSTRAP')) ? "<ul class='thumbnails'><li>".implode("</li><li>",$images)."</li></ul>".vartrue($txt) : implode("<br />",$images).vartrue($txt);	
+				if(deftrue('BOOTSTRAP')) 
+				{
+					return "<ul class='thumbnails list-unstyled'><li>".implode("</li><li>",$images)."</li></ul>".vartrue($txt); 
+				}
+				else
+				{
+					implode("<br />",$images).vartrue($txt);	
+				}
 			}
-			
-			
+						
 			return $txt;
-			
-			
 		}
 
 	}