diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index d962e1e1fe22d0f3d08e00bc9d43a404eb223757..9184ea8d146f6b1e4c683d8cc159d3d6a12ec27d 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -295,7 +295,7 @@ class MailFetcher {
             foreach($list as $addr) {
                 if(!($emailId=Email::getIdByEmail(strtolower($addr->mailbox).'@'.$addr->host))) {
                     $header['recipients'][] = array(
-                            'source' => $source,
+                            'source' => "Email ($source)",
                             'name' => $this->mime_decode(@$addr->personal),
                             'email' => strtolower($addr->mailbox).'@'.$addr->host);
                 } elseif(!$header['emailId']) {
diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index 48cf98a59107736936b35d2738f734c3ad5f0e94..fc865d4de2c333738ea107f73b450cb1cdcbff30 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -402,7 +402,7 @@ class EmailDataParser {
             foreach($list as $addr) {
                 if(!($emailId=Email::getIdByEmail(strtolower($addr->mailbox).'@'.$addr->host))) {
                     $data['recipients'][] = array(
-                        'source' => $source,
+                        'source' => "Email ($source)",
                         'name' => trim(@$addr->personal, '"'),
                         'email' => strtolower($addr->mailbox).'@'.$addr->host);
                 } elseif(!$data['emailId']) {
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 3ff5371354bb13f5fe33f747239add72f8143a8f..1a1a822cc8b6865c2326a1ac2ae08c63ff5699dd 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -1466,9 +1466,9 @@ class Ticket {
             foreach ($vars['recipients'] as $recipient) {
                 if (($user=User::fromVars($recipient)))
                     if ($c=$this->addCollaborator($user, $info, $errors))
-                        $collabs[] = sprintf('%s %s',
+                        $collabs[] = sprintf('%s%s',
                                 (string) $c,
-                                $recipient['source'] ? " ({$recipient['source']}) " : ''
+                                $recipient['source'] ? " via {$recipient['source']}" : ''
                                 );
             }
             //TODO: Can collaborators add others?