diff --git a/program/lib/Roundcube/rcube_html2text.php b/program/lib/Roundcube/rcube_html2text.php
index 269d350ef..2c16171b5 100644
--- a/program/lib/Roundcube/rcube_html2text.php
+++ b/program/lib/Roundcube/rcube_html2text.php
@@ -234,7 +234,7 @@ class rcube_html2text
'-',
'*',
'£',
- 'EUR', // Euro sign. € ?
+ 'EUR', // Euro sign. €
'|+|amp|+|', // Ampersand: see _converter()
' ', // Runs of spaces, post-handling
);
diff --git a/program/lib/Roundcube/rcube_image.php b/program/lib/Roundcube/rcube_image.php
index 78f6e6176..42640f448 100644
--- a/program/lib/Roundcube/rcube_image.php
+++ b/program/lib/Roundcube/rcube_image.php
@@ -166,7 +166,10 @@ class rcube_image
else {
try {
$image = new Imagick($this->image_file);
- $image = $image->flattenImages();
+
+ $image->setImageBackgroundColor('white');
+ $image->setImageAlphaChannel(11);
+ $image->mergeImageLayers(Imagick::LAYERMETHOD_FLATTEN);
$image->setImageColorspace(Imagick::COLORSPACE_SRGB);
$image->setImageCompressionQuality(75);