Merge branch '2015.11-develop' into 2016.11

diff --cc tests/tine20/Felamimail/Frontend/JsonTest.php
index fd74d1a,3b1e116..aebee3b
--- 1/tests/tine20/Felamimail/Frontend/JsonTest.php
--- 2/tests/tine20/Felamimail/Frontend/JsonTest.php
+++ b/tests/tine20/Felamimail/Frontend/JsonTest.php
@@@ -568,26 -565,17 +565,19 @@@ class Felamimail_Frontend_JsonTest exte
      /**
       * test send message to invalid recipient
       */
-     public function testSendMessageToInvalidRecipient($invalidEmail = null, $toField = 'to', $expectedExceptionMessage = 'Recipient address rejected')
+     public function testSendMessageToInvalidRecipient()
      {
 +        $this->markTestSkipped('FIXME: 0011802: Felamimail_Frontend_JsonTest::testSendMessageToInvalidRecipient fails');
 +
          $messageToSend = $this->_getMessageData($this->_account->email);
-         if ($invalidEmail === null) {
-             $invalidEmail = 'invaliduser@' . $this->_mailDomain;
-         }
-         if ($toField !== 'to') {
-             $messageToSend['to'] = array(Tinebase_Core::getUser()->accountEmailAddress);
-         }
-         $messageToSend[$toField] = array($invalidEmail);
- 
-         $translation = Tinebase_Translation::getTranslation('Felamimail');
- 
+         $invalidEmail = 'invaliduser@' . $this->_mailDomain;
+         $messageToSend['to'] = array($invalidEmail);
+         
          try {
-             $this->_json->saveMessage($messageToSend);
+             $returned = $this->_json->saveMessage($messageToSend);
              $this->fail('Tinebase_Exception_SystemGeneric expected');
          } catch (Tinebase_Exception_SystemGeneric $tesg) {
-             $this->assertContains('<' . $invalidEmail . '>: ' . $translation->_($expectedExceptionMessage), $tesg->getMessage(),
+             $this->assertContains('550 5.1.1 <' . $invalidEmail . '>: Recipient address rejected', $tesg->getMessage(),
                  'exception message did not match: ' . $tesg->getMessage());
          }
      }

diff --cc tine20/Tinebase/Mail.php
Simple merge