= 1.7.7 - 2017-10-17

* Fixed: Error sending files with sendgrid
* Fixed: Wrong attachments format in Mandrill
* Fixed: Wrong Sender Header in Mandrill

1 files changed, 2 insertions, 2 deletions

diff --git a/Postman/Postman-Mail/PostmanMandrillMailEngine.php b/Postman/Postman-Mail/PostmanMandrillMailEngine.php
index bd26e07..7549a37 100644
--- a/Postman/Postman-Mail/PostmanMandrillMailEngine.php
+++ b/Postman/Postman-Mail/PostmanMandrillMailEngine.php
@@ -69,7 +69,7 @@ if ( ! class_exists( 'PostmanMandrillMailEngine' ) ) {
 			// add the From Header
 			$sender = $message->getFromAddress();
 			{
-				$senderEmail = $sender->getEmail();
+				$senderEmail = PostmanOptions::getInstance()->getMessageSenderEmail();
 				$senderName = $sender->getName();
 				assert( ! empty( $senderEmail ) );
 				$this->mandrillMessage ['from_email'] = $senderEmail;
@@ -217,7 +217,7 @@ if ( ! class_exists( 'PostmanMandrillMailEngine' ) ) {
 						$attachment = array(
 								'type' => 'attachment',
 								'name' => basename( $file ),
-								'content' => file_get_contents( $file ),
+								'content' => base64_encode( file_get_contents( $file ) ),
 						);
 						array_push( $this->mandrillMessage ['attachments'], $attachment );
 					}