Index: lams_tool_forum/web/WEB-INF/lams.tld
===================================================================
diff -u -re4a1fb3c417f6227175bef9c7e20e985feec6a85 -r9b2c0bcea9343b234ed746093ecb13c3ff636701
--- lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e4a1fb3c417f6227175bef9c7e20e985feec6a85)
+++ lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 9b2c0bcea9343b234ed746093ecb13c3ff636701)
@@ -430,5 +430,9 @@
 	    <name>DefineLater</name>
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>ImgButtonWrapper</name>
+		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
+   	</tag-file>  
 
 </taglib>
Index: lams_tool_forum/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/ImgButtonWrapper.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/ImgButtonWrapper.tag	(revision 9b2c0bcea9343b234ed746093ecb13c3ff636701)
@@ -0,0 +1,37 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d -r9b2c0bcea9343b234ed746093ecb13c3ff636701
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 9b2c0bcea9343b234ed746093ecb13c3ff636701)
@@ -48,14 +48,14 @@
 				<html:file tabindex="3" property="attachmentFile" />
 			</div>
 
-			<div style="padding-bottom:30px;">
+			<lams:ImgButtonWrapper>
 				<a href="#" onclick="getElementById('topicFormId').submit();"
 					class="button-add-item"> <fmt:message key="button.add" /> </a>
 
 				<a href="#" onclick="javascript:window.parent.hideMessage()"
 					class="button space-left"> <fmt:message key="button.cancel" />
 				</a>
-			</div>
+			</lams:ImgButtonWrapper>
 
 		</html:form>
 	</body>
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d -r9b2c0bcea9343b234ed746093ecb13c3ff636701
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 9b2c0bcea9343b234ed746093ecb13c3ff636701)
@@ -63,14 +63,14 @@
 				<%@ include file="/jsps/authoring/parts/msgattachment.jsp"%>
 			</div>
 
-			<div style="padding-bottom:30px;">
+			<lams:ImgButtonWrapper>
 				<a href="#" onclick="getElementById('topicFormId').submit();"
 					class="button-add-item"> <fmt:message key="button.add" /> </a>
 					
 				<a href="#" onclick="javascript:window.parent.hideMessage()"
 					class="button space-left"> <fmt:message key="button.cancel" />
 				</a>
-			</div>
+			</lams:ImgButtonWrapper>
 		</html:form>
 	</body>
 </lams:html>
Index: lams_tool_forum/web/jsps/authoring/message/view.jsp
===================================================================
diff -u -rfc79bbd0ac6d17b167882ca736c30ee3bdb4984d -r9b2c0bcea9343b234ed746093ecb13c3ff636701
--- lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision fc79bbd0ac6d17b167882ca736c30ee3bdb4984d)
+++ lams_tool_forum/web/jsps/authoring/message/view.jsp	(.../view.jsp)	(revision 9b2c0bcea9343b234ed746093ecb13c3ff636701)
@@ -56,24 +56,26 @@
 			</c:if>
 			<tr>
 				<td align="center">
-					<html:link href="javascript:window.parent.hideMessage()"
-						styleClass="button space-left">
-						<fmt:message key="button.cancel" />
-					</html:link>
-					<c:set var="deletetopic">
-						<html:rewrite
-							page="/authoring/deleteTopic.do?sessionMapID=${sessionMapID}&topicIndex=${topicIndex}" />
-					</c:set>
-					<html:link href="${deletetopic}" styleClass="button space-left">
-						<fmt:message key="label.delete" />
-					</html:link>
-					<c:set var="edittopic">
-						<html:rewrite
-							page="/authoring/editTopic.do?sessionMapID=${sessionMapID}&topicIndex=${topicIndex}&create=${topic.message.created.time}" />
-					</c:set>
-					<html:link href="${edittopic}" styleClass="button space-left">
-						<fmt:message key="label.edit" />
-					</html:link>
+					<lams:ImgButtonWrapper>
+						<html:link href="javascript:window.parent.hideMessage()"
+							styleClass="button space-left">
+							<fmt:message key="button.cancel" />
+						</html:link>
+						<c:set var="deletetopic">
+							<html:rewrite
+								page="/authoring/deleteTopic.do?sessionMapID=${sessionMapID}&topicIndex=${topicIndex}" />
+						</c:set>
+						<html:link href="${deletetopic}" styleClass="button space-left">
+							<fmt:message key="label.delete" />
+						</html:link>
+						<c:set var="edittopic">
+							<html:rewrite
+								page="/authoring/editTopic.do?sessionMapID=${sessionMapID}&topicIndex=${topicIndex}&create=${topic.message.created.time}" />
+						</c:set>
+						<html:link href="${edittopic}" styleClass="button space-left">
+							<fmt:message key="label.edit" />
+						</html:link>
+					</lams:ImgButtonWrapper>
 
 				</td>
 			</tr>