Merge branch 'Sanjaybhattwebkul-master' into 1.0

Author: Sanjeev Papnoi

Services/MailboxService.php

@@ -397,7 +397,8 @@ public function processMail($rawEmail)
                 $mailData['user'] = $user;
                 $userDetails = $user->getCustomerInstance()->getPartialDetails();
             } else if ($this->entityManager->getRepository(Ticket::class)->isTicketCollaborator($ticket, $mailData['from'])){
-                $user = $ticket->getCustomer();
+            	// Reply from collaborator
+                $user = $this->entityManager->getRepository(User::class)->findOneByEmail($mailData['from']);
 
                 $mailData['user'] = $user;
                 $mailData['createdBy'] = 'collaborator';