Fix missing but expected accountId and mailboxId on message JSON

This caused two bugs
* Reply all did not work (the account lookup failed because `undefined`
  was used as ID)
* The preselected account in the reply composer was not automatically
  set to the one from the original message

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

1 files changed, 2 insertions, 0 deletions

diff --git a/lib/Controller/MessagesController.php b/lib/Controller/MessagesController.php
index df602bf94..ba284e76c 100755
--- a/lib/Controller/MessagesController.php
+++ b/lib/Controller/MessagesController.php
@@ -233,6 +233,8 @@ class MessagesController extends Controller {
 				$a
 			);
 		}, $json['attachments']);
+		$json['accountId'] = $account->getId();
+		$json['mailboxId'] = $mailbox->getId();
 		$json['databaseId'] = $message->getId();
 
 		return new JSONResponse($json);