diff options
| author | Steffen Lindner <mail@steffen-lindner.de> | 2016-05-10 18:35:30 +0300 |
|---|---|---|
| committer | Steffen Lindner <mail@steffen-lindner.de> | 2016-05-10 18:35:30 +0300 |
| commit | ca98142153ad3a2c5f00b03b3640f43b0c238d5f (patch) | |
| tree | ac2d990444a8dd83f3a4e911b77e06dfbc6ccde1 | |
| parent | 4c7bac4b68e73d4224f2196d9dc8c84b3627ee3c (diff) | |
| parent | 14f78b164fab2c97fc0eff330c5300fbccc972a4 (diff) | |
Merge pull request #1482 from owncloud/dont-break-lines
Dont break lines
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | js/service/messageservice.js | 4 | ||||
| -rw-r--r-- | lib/account.php | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 45aa09960..c9ef98daf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file. ### Fixed - Bring back menu toggle button for mobile [#1483](https://github.com/owncloud/mail/pull/1483) @ChristophWurst +- Don't send messages in flowed text format + [#1482](https://github.com/owncloud/mail/pull/1482) @ChristophWurst ## 0.4.4 – 2016-05-06 diff --git a/js/service/messageservice.js b/js/service/messageservice.js index 1a606ba9d..dc37b4c1d 100644 --- a/js/service/messageservice.js +++ b/js/service/messageservice.js @@ -208,8 +208,8 @@ define(function(require) { defer.resolve(data); }, - error: function() { - defer.reject(); + error: function(xhr) { + defer.reject(xhr); }, data: { to: message.to, diff --git a/lib/account.php b/lib/account.php index 511907455..061ee7a8e 100644 --- a/lib/account.php +++ b/lib/account.php @@ -190,7 +190,7 @@ class Account implements IAccount { // Send the message $transport = $this->createTransport(); - $mail->send($transport); + $mail->send($transport, false, false); // Save the message in the sent folder $sentFolder = $this->getSentFolder(); |