Version 5.0.6

system/Email/Email.php

@@ -13,6 +13,7 @@ namespace IPS;
 /* To prevent PHP errors (extending class does not exist) revealing path */
 
 use BadMethodCallException;
+use DateInterval;
 use DOMElement;
 use DOMNode;
 use DOMText;
@@ -127,7 +128,9 @@ abstract class Email
 	{
 		foreach( static::outgoingHandlers() as $key => $class )
 		{
-			if( ( Settings::i()->mail_method == $key AND $class::isUsable( $type ) ) OR ( $key == 'debug' and $class::isUsable( Email::TYPE_TRANSACTIONAL ) ) )
+			if( ( Settings::i()->mail_method == $key AND $class::isUsable( $type ) )
+				OR ( $key == 'sendgrid' and $class::isUsable( $type ) ) // SendGrid is a special use case since it can send bulk mail only.
+				OR ( $key == 'debug' and $class::isUsable( \IPS\Email::TYPE_TRANSACTIONAL ) ) )
 			{
 				return $class;
 			}
@@ -466,7 +469,7 @@ abstract class Email
 			$ourPicks = NULL;
 			if( Settings::i()->our_picks_in_email and $this->type !== 'transactional' )
 			{
-				$ourPicks = Feature::internalStream( 4 );
+				$ourPicks = Feature::internalStream( 4, 'promote_added', 'desc', DateTime::create()->sub( new DateInterval( 'P1Y' ) ) );
 			}
 
 			/* Wrap */