Index: moodle/mod/forum/lib.php
--- moodle/mod/forum/lib.php Base (1.884)
+++ moodle/mod/forum/lib.php Locally Modified (Based On 1.884)
@@ -3185,9 +3209,6 @@
         }
     }
 
-    echo '<a id="p'.$post->id.'"></a>';
-    echo '<table cellspacing="0" class="forumpost'.$read_style.'">';
-
     // Picture
     $postuser = new object();
     $postuser->id        = $post->userid;
@@ -3197,32 +3218,17 @@
     $postuser->picture   = $post->picture;
     $postuser->email     = $post->email;
 
-    echo '<tr class="header"><td class="picture left">';
-    echo $OUTPUT->user_picture($postuser, array('courseid'=>$course->id));
-    echo '</td>';
-
-    if ($post->parent) {
-        echo '<td class="topic">';
-    } else {
-        echo '<td class="topic starter">';
+    $topicclass = 'topic';
+    if (!$post->parent) {
+        $topicclass = 'topic starter';
     }
 
-    if (!empty($post->subjectnoformat)) {
-        echo '<div class="subject">'.$post->subject.'</div>';
-    } else {
-        echo '<div class="subject">'.format_string($post->subject).'</div>';
-    }
+    echo '<a id="p'.$post->id.'"></a>';
+    echo '<div class="forumpost '.$read_style.'">';
+    echo '<div class="picture left">';
+    echo $OUTPUT->user_picture($postuser, array('courseid'=>$course->id));
+    echo ' </div>';
 
-    echo '<div class="author">';
-    $fullname = fullname($postuser, $cm->cache->caps['moodle/site:viewfullnames']);
-    $by = new object();
-    $by->name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.
-                $post->userid.'&amp;course='.$course->id.'">'.$fullname.'</a>';
-    $by->date = userdate($post->modified);
-    print_string('bynameondate', 'forum', $by);
-    echo '</div></td></tr>';
-
-    echo '<tr><td class="left side">';
     if (isset($cm->cache->usersgroups)) {
         $groups = array();
         if (isset($cm->cache->usersgroups[$post->userid])) {
@@ -3235,15 +3241,30 @@
     }
 
     if ($groups) {
+        echo '<div class="group_picture">';
         print_group_picture($groups, $course->id, false, false, true);
+        echo '</div>';
+    } 
+    
+    echo '<div class="content">';    
+    echo '<div class="'. $topicclass.'">';
+    if (!empty($post->subjectnoformat)) {
+        echo '<div class="subject">'.$post->subject.'</div>';
     } else {
-        echo '&nbsp;';
+        echo '<div class="subject">'.format_string($post->subject).'</div>';
     }
+    echo '<div class="author">';
+    $fullname = fullname($postuser, $cm->cache->caps['moodle/site:viewfullnames']);
+    $by = new object();
+    $by->name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.
+                $post->userid.'&amp;course='.$course->id.'">'.$fullname.'</a>';
+    $by->date = userdate($post->modified);
+    print_string('bynameondate', 'forum', $by);
+    echo '</div>';  // author
+    echo '</div>';  // topic
 
+    echo '<div class="post">';
 // Actual content
-
-    echo '</td><td class="content">'."\n";
-
     list($attachments, $attachedimages) = forum_print_attachments($post, $cm, 'separateimages');
 
     if ($attachments !== '') {
@@ -3273,8 +3294,6 @@
         echo '</div>';
         echo $attachedimages;
     }
-
-
 // Commands
 
     $commands = array();
@@ -3370,7 +3389,6 @@
     }
 
 // Link to post if required
-
     if ($link) {
         echo '<div class="link">';
         if ($post->replies == 1) {
@@ -3386,8 +3404,12 @@
     if ($footer) {
         echo '<div class="footer">'.$footer.'</div>';
     }
-    echo '</td></tr></table>'."\n\n";
 
+    echo '</div>';  // content
+    echo '</div>';  // contentright
+    echo '<div class="clearfloat">&nbsp;</div>';    
+    echo '</div>'; //forumpost
+
     if ($istracked && !$CFG->forum_usermarksread && !$post_read) {
         forum_tp_mark_post_read($USER->id, $post, $forum->id);
     }
Index: moodle/mod/forum/post.php
--- moodle/mod/forum/post.php Base (1.213)
+++ moodle/mod/forum/post.php Locally Modified (Based On 1.213)
@@ -790,21 +790,18 @@
 
 $forcefocus = empty($reply) ? NULL : 'message';
 
-if (!empty($discussion->id)) {
+if (!empty($discussion->id) && !$edit) {
     $PAGE->navbar->add(format_string($toppost->subject, true), "discuss.php?d=$discussion->id");
 }
 
 if ($post->parent) {
     $PAGE->navbar->add(get_string('reply', 'forum'));
-}
-
-if ($edit) {
+} else if ($edit) {
     $PAGE->navbar->add(get_string('edit', 'forum'));
 }
 
 $PAGE->set_title("$course->shortname: $strdiscussionname ".format_string($toppost->subject));
 $PAGE->set_heading($course->fullname);
-$PAGE->set_focuscontrol($mform_post->focus($forcefocus));
 
 echo $OUTPUT->header();
 
Index: moodle/mod/forum/styles.css
--- moodle/mod/forum/styles.css Base (1.3)
+++ moodle/mod/forum/styles.css Locally Modified (Based On 1.3)
@@ -51,3 +51,18 @@
 #user-view .forumpost,
 .course .forumpost {width: 100%;}
 #email .unsubscribelink {margin-top:20px;}
+
+.forumpost .picture {float: left; vertical-align: top; padding: 4px;}
+.forumpost .content {float:left;vertical-align: top; max-width: 90%;}
+.forumpost .content .topic {min-height: 36px; }
+.forumpost .content .post {padding: 5px;}
+
+#page-mod-forum-discuss .clearfloat,
+#page-mod-forum-view .clearfloat,
+#page-site-index .clearfloat {float: none;clear: both; height:0px;}
+
+
+/** Styles for right to left layout */
+.dir-rtl .forumpost .picture {float: right; }
+.dir-rtl .forumpost .content {float:right; padding:0;}
+