Index: MessageRenderer.java
===================================================================
--- MessageRenderer.java	(revision 563150)
+++ MessageRenderer.java	(working copy)
@@ -111,19 +111,7 @@
     boolean hasMessage = (message != null);
   
     
-    // When there's both a help facet and a message, and we need to indent,
-    // then we want to use a div around the whole thing - so that both
-    // the help facet and message will be indented.  Otherwise, we'll
-    // get away with a span.
-    boolean useDiv = (hasHelp && hasMessage && (inlineStyle != null));
-    if (useDiv)
-    {
-      writer.startElement("div", component);
-    }
-    else
-    {
-      writer.startElement("span", component);
-    }
+    writer.startElement("div", component);
 
     renderId(context, component);
     // render all the attributes BUT the style classes, since we'll do 
@@ -137,7 +125,6 @@
     // our default styles if necessary.
     String beanStyleClass = getStyleClass(bean);
  
-
     // both help facet and message exist and messageType is error
     // so need 2 divs inside span with id
     if ( hasHelp && hasMessage && isError )
@@ -163,6 +150,9 @@
     // 3. Both exist and messageType not error
     else if (hasHelp || hasMessage)
     {  
+
+      writer.startElement("div", null);
+
       // if there's a help facet the styleclass should not be error
       if (hasHelp)
         styleClass = SkinSelectors.INLINE_INFO_TEXT_STYLE_CLASS;
@@ -182,22 +172,17 @@
       else
         renderStyleClass(context, arc, styleClass);
       
-      if ( hasHelp )        
-      encodeChild(context, help); 
+      if (hasHelp)        
+        encodeChild(context, help); 
 
-      if (hasHelp && hasMessage)
-      {
-        writer.startElement("br", null);
-        writer.endElement("br");
-      }
-
       if (hasMessage)
       {
         renderPossiblyFormattedText(context, message);
       }
 
+      writer.endElement("div");
     }
-    
+
     // Render a hidden container for client-side messages
     RequestContext rc = RequestContext.getCurrentInstance();
     boolean isInline = (rc.getClientValidation() ==
@@ -208,23 +193,7 @@
       
       if (forId != null)
       {
-        if (hasHelp && hasMessage)
-          writer.startElement(XhtmlConstants.DIV_ELEMENT, null);
-        else 
-        {
-          if (hasHelp || hasMessage)
-          {
-            writer.startElement("br", null);
-            writer.endElement("br");
-          }
-          else
-          {
-            // Add style to outer span
-            renderStyleClass(context, arc, SkinSelectors.INLINE_INFO_TEXT_STYLE_CLASS); 
-          }
-          
-          writer.startElement(XhtmlConstants.SPAN_ELEMENT, null);
-        }
+        writer.startElement(XhtmlConstants.DIV_ELEMENT, null);
         
         writer.writeAttribute(XhtmlConstants.ID_ATTRIBUTE, 
                               forId + "::msg", null);
@@ -232,23 +201,12 @@
                               "display:none;", null);
         renderStyleClass(context, arc, 
                          SkinSelectors.INLINE_ERROR_TEXT_STYLE_CLASS);
-        if (hasHelp && hasMessage)
-          writer.endElement(XhtmlConstants.DIV_ELEMENT);
-        else
-        {
-          writer.endElement(XhtmlConstants.SPAN_ELEMENT);
-        }
+        writer.endElement(XhtmlConstants.DIV_ELEMENT);
       }
     }
 
-    if (useDiv)
-    {
-      writer.endElement("div");
-    }
-    else
-    {
-      writer.endElement("span");
-    }
+    writer.endElement("div");
+
   }
 
   //