diff --git a/lib/toselector.php b/lib/toselector.php
index 4c0bda3312..566b6a0f29 100644
--- a/lib/toselector.php
+++ b/lib/toselector.php
@@ -102,12 +102,16 @@ class ToSelector extends Widget
             $choices[$value] = $groups->getBestName();
         }
 
-	// Add subscribed users to dropdown menu
-	$users = $this->user->getSubscribed();
-	while ($users->fetch()) {
-	  $value = 'profile:'.$users->id;
-	  $choices[$value] = $users->getBestName();
-	}
+        // Add subscribed users to dropdown menu
+        $users = $this->user->getSubscribed();
+        while ($users->fetch()) {
+            $value = 'profile:'.$users->id;
+            if ($this->user->streamNicknames()) {
+                $choices[$value] = $users->getNickname();
+            } else {
+                $choices[$value] = $users->getBestName();
+            }
+        }
 
         if ($this->to instanceof Profile) {
             $value = 'profile:'.$this->to->id;