diff -urp activity1/activity_comments/activity_comments.js activity/activity_comments/activity_comments.js
--- activity1/activity_comments/activity_comments.js	2010-01-13 15:25:29.000000000 +1000
+++ activity/activity_comments/activity_comments.js	2010-05-16 19:50:29.223370342 +1000
@@ -18,7 +18,7 @@
    * Handles the default text in the comment text field.
    */
   Drupal.behaviors.activityDefaultText = function (context) {
-    $('input.activity-comment-text:not(.activity-default-text-processed)').each(function (i) {
+    $('textarea.activity-comment-text:not(.activity-default-text-processed)').each(function (i) {
       // we you focus on the form area, hide the default text.
       $(this).focus(function() {
         if ($(this).val() == Drupal.settings.activity_comments.default_text) {
diff -urp activity1/activity_comments/activity_comments.module activity/activity_comments/activity_comments.module
--- activity1/activity_comments/activity_comments.module	2010-01-13 15:25:29.000000000 +1000
+++ activity/activity_comments/activity_comments.module	2010-05-16 21:39:04.823362268 +1000
@@ -133,12 +133,17 @@ function activity_comments_form($form_st
     '#access' => user_access('activity post comments'),
     '#prefix' => '<div class="container-inline">',
     '#suffix' => '</div>',
+    '#type' => 'fieldset',
+    '#title' => t('Comment'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE
+
   );
   $form['activity_form_items']['activity_comment'] = array(
-    '#type' => 'textfield',
-    '#maxlength' => 250,
+    '#type' => 'textarea',
+
     '#size' => 25,
-    '#default_value' => t('Write a comment'),
+    '#default_value' => t('Write a comment...'),
     '#attributes' => array('class' => 'activity-comment-text'),
   );
   $form['aid'] = array(
@@ -151,7 +156,7 @@ function activity_comments_form($form_st
   );
   $form['activity_form_items']['activity_save_comment'] = array(
     '#type' => 'submit',
-    '#value' => t('Add'),
+    '#value' => t('Comment'),
     '#ahah' => array(
       'path' => 'activity/comments/insert',
       'wrapper' => 'activity-comments-' . $aid,
Only in activity/activity_comments: activity_comments.module~
diff -urp activity1/activity_comments/activity-comment.tpl.php activity/activity_comments/activity-comment.tpl.php
--- activity1/activity_comments/activity-comment.tpl.php	2010-01-13 15:25:29.000000000 +1000
+++ activity/activity_comments/activity-comment.tpl.php	2010-05-16 21:13:06.732112941 +1000
@@ -16,17 +16,14 @@
  * @see template_preprocess_activity_comment()
  */
 ?>
-<div class='container-inline'>
-  <span class='activity-user'><?php print $username ?></span>
-  <div class='activity-comment'><?php print $comment_value ?></div>
+<div class='sa-activity-comment'>
+<div class="activity_user-picture"><?php print $user_picture; ?></div>
+
+<div class="comment-activity">
+<?php if (!empty($delete_link)) :?><div class='activity-comments-delete'><?php print $delete_link; ?></div><?php endif; ?>
+<span class='activity-user'><?php print $username ?></span>
+<div class='activity-comment'><?php print $comment_value ?></div>
+<div class='activity-comments-meta'><div class='activity-comments-timestamp'><?php print $date; ?></div>
+
 </div>
-<div class='activity-comments-meta'>
-  <div class='activity-comments-timestamp'>
-    <?php print $date; ?>
-  </div>
-  <?php if (!empty($delete_link)) :?>
-    <div class='activity-comments-delete'>
-      <?php print $delete_link; ?>
-    </div>
-  <?php endif; ?>
 </div>
Only in activity/activity_comments: activity-comment.tpl.php~
Only in activity: d6.pacth