diff --git a/e107_core/shortcodes/single/wmessage.php b/e107_core/shortcodes/single/wmessage.php
index c9744306b..8cf556988 100644
--- a/e107_core/shortcodes/single/wmessage.php
+++ b/e107_core/shortcodes/single/wmessage.php
@@ -84,8 +84,10 @@ function wmessage_shortcode($parm='')
 				}
 				else
 				{
+					echo "<div class='wmessage'>";
 				  	echo ($wmcaption) ? $wmcaption.'<br />' : '';
 					echo implode('<br />',$wmessage);
+					echo "</div>";
 				}
 
 				$cache_data = ob_get_flush();