4 files changed, 14 insertions, 21 deletions
diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php
index 1b9d71c56..e2dd5fdac 100644
--- a/mod/thewire/languages/en.php
+++ b/mod/thewire/languages/en.php
@@ -13,7 +13,7 @@ $english = array(
 	'thewire:user' => "%s's wire posts",
 	'thewire:friends' => "Friends' wire posts",
 	'thewire:reply' => "Reply",
-	'thewire:replying' => "Replying to %s who wrote",
+	'thewire:replying' => "Replying to %s (@%s) who wrote",
 	'thewire:thread' => "Thread",
 	'thewire:charleft' => "characters remaining",
 	'thewire:tags' => "Wire posts tagged with '%s'",
@@ -29,7 +29,7 @@ $english = array(
 	/**
 	 * The wire river
 	 */
-	'thewire:river:create' => "posted to the wire",
+	'river:create:object:thewire' => "%s posted to the wire",
 
 	/**
 	 * Wire widget
diff --git a/mod/thewire/views/default/js/thewire.php b/mod/thewire/views/default/js/thewire.php
index 1eda90bee..d9bf6d10e 100644
--- a/mod/thewire/views/default/js/thewire.php
+++ b/mod/thewire/views/default/js/thewire.php
@@ -30,7 +30,7 @@ elgg.thewire.init = function() {
  */
 elgg.thewire.textCounter = function(textarea, status, limit) {
 
-	var remaining_chars = limit - textarea.value.length;
+	var remaining_chars = limit - $(textarea).val().length;
 	status.html(remaining_chars);
 
 	if (remaining_chars < 0) {
@@ -83,4 +83,4 @@ elgg.thewire.viewPrevious = function(event) {
 	event.preventDefault();
 }
 
-elgg.register_hook_handler('init', 'system', elgg.thewire.init);
-\ No newline at end of file
+elgg.register_hook_handler('init', 'system', elgg.thewire.init);
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index d4dac38ee..2e9cfd83b 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -7,18 +7,8 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = thewire_filter($excerpt);
 
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $object->title,
-);
-$link = elgg_view('output/url', $params);
-
-echo elgg_echo('thewire:river:create');
-
-echo " $link";
-
-if ($excerpt) {
-	echo '<div class="elgg-river-content">';
-	echo $excerpt;
-	echo '</div>';
-}
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+	'summary' => false,
+));
+\ No newline at end of file
diff --git a/mod/thewire/views/default/thewire/reply.php b/mod/thewire/views/default/thewire/reply.php
index 3794e1454..341b691b1 100644
--- a/mod/thewire/views/default/thewire/reply.php
+++ b/mod/thewire/views/default/thewire/reply.php
@@ -5,7 +5,10 @@
 
 $post = $vars['post'];
 $poster = $post->getOwnerEntity();
-
+$poster_details = array(
+	htmlspecialchars($poster->name,  ENT_QUOTES, 'UTF-8'),
+	htmlspecialchars($poster->username,  ENT_QUOTES, 'UTF-8'),
+);
 ?>
-<b><?php echo elgg_echo('thewire:replying', array($poster->name)); ?>: </b>
+<b><?php echo elgg_echo('thewire:replying', $poster_details); ?>: </b>
 <?php echo $post->description;
 \ No newline at end of file