Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

diff --git a/lib/mailbox.php b/lib/mailbox.php
index e1d384a0635207d97e9c04c1482f8d6fa65e05a7..90a58b4c486bfed92fe98f28371dacf6446182e9 100644 (file)
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -282,7 +282,7 @@ class MailboxAction extends CurrentUserDesignAction
                                     $ns->name);
                 $this->elementEnd('span');
             } else {
-                $this->out->element('span', 'device', $source_name);
+                $this->element('span', 'device', $source_name);
             }
             break;
         }