Allow overwriting the from name and email

Fixes #37

(cherry picked from commit 4f18050)

includes/class-mailtpl-mailer.php

@@ -160,21 +160,23 @@ private function replace_placeholders( $email, $user_email = '' ) {
 	 * @since 1.0.0
 	 * @return string
 	 */
-	public function set_from_email( $email ){
-		if( empty( $this->opts['from_email'] ) )
-			return $email;
-		return $this->opts['from_email'];
+	public function set_from_email( $email ) {
+		if ( empty( $email ) ) {
+			return $this->opts['from_email'];
+		}
+		return $email;
 	}
 
 	/**
 	 * Sets email's From name
 	 * @since 1.0.0
 	 * @return string
 	 */
-	public function set_from_name( $name ){
-		if( empty( $this->opts['from_name'] ) )
-			return $name;
-		return $this->opts['from_name'];
+	public function set_from_name( $name ) {
+		if ( empty( $name ) ) {
+			return $this->opts['from_name'];
+		}
+		return $name;
 	}
 
 	/**