diff --git a/core/um-mail.php b/core/um-mail.php
index b4d8e0e1..95cafc26 100644
--- a/core/um-mail.php
+++ b/core/um-mail.php
@@ -5,37 +5,39 @@ class UM_Mail {
 	function __construct() {
 
 		add_filter('mandrill_nl2br', array(&$this, 'mandrill_nl2br') );
-		
+
 		$this->force_plain_text = '';
-		
+
 	}
-	
+
 	/***
 	***	@mandrill compatibility
 	***/
 	function mandrill_nl2br($nl2br, $message = '') {
-		
+
 		// text emails
 		if ( !um_get_option('email_html') ) {
 			$nl2br = true;
 		}
-		
+
 		return $nl2br;
 
 	}
-	
+
 	/***
 	***	@check If template exists
 	***/
 	function email_template( $template, $args = array() ) {
 		$lang = '';
-		
+
 		if ( function_exists('icl_get_current_language') ) {
 			if ( icl_get_current_language() != 'en' ) {
 				$lang = icl_get_current_language() . '/';
 			}
+		} else {
+			$lang = get_locale();
 		}
-		
+
 		if ( file_exists( get_stylesheet_directory() . '/ultimate-member/templates/email/' . $lang . $template . '.html' ) ) {
 			return get_stylesheet_directory() . '/ultimate-member/templates/email/' . $lang . $template . '.html';
 		}
@@ -45,30 +47,30 @@ class UM_Mail {
 		} else {
 			$path = um_path . 'templates/email/' . $lang;
 		}
-		
+
 		if ( file_exists( $path . $template . '.html' ) ) {
 			return $path . $template . '.html';
 		}
-		
+
 		return false;
-		
+
 	}
-	
+
 	/***
 	***	@sends an email to any user
 	***/
 	function send( $email, $template=null, $args = array() ) {
-	
+
 		if ( !$template ) return;
 		if ( um_get_option( $template . '_on' ) != 1 ) return;
 		if ( !is_email( $email ) ) return;
-		
+
 		$this->attachments = null;
 		$this->headers = 'From: '. um_get_option('mail_from') .' <'. um_get_option('mail_from_addr') .'>' . "\r\n";
 
 		$this->subject = um_get_option( $template . '_sub' );
 		$this->subject = um_convert_tags( $this->subject, $args );
-		
+
 		if ( isset( $args['admin'] ) || isset( $args['plain_text'] ) ) {
 			$this->force_plain_text = 'forced';
 		}
@@ -80,31 +82,31 @@ class UM_Mail {
 		} else {
 			$this->message = um_get_option( $template );
 		}
-		
+
 		// Convert tags in body
 		$this->message = um_convert_tags( $this->message, $args );
 
 		// Send mail
 		wp_mail( $email, $this->subject, $this->message, $this->headers, $this->attachments );
 		remove_filter( 'wp_mail_content_type', array(&$this, 'set_content_type')  );
-		
+
 		// reset globals
 		$this->force_plain_text = '';
-		
+
 	}
-	
+
 	/***
 	***	@maybe sending HTML emails
 	***/
 	function set_content_type( $content_type ) {
 		if ( $this->force_plain_text == 'forced' )
 			return 'text/plain';
-		
+
 		if ( um_get_option('email_html') )
 			return 'text/html';
-		
+
 		return 'text/plain';
 	}
-	
 
-}
\ No newline at end of file
+
+}