diff --git a/wp-mail.php b/wp-mail.php
index 07820e6..1c9bba5 100644
--- a/wp-mail.php
+++ b/wp-mail.php
@@ -8,7 +8,7 @@
  */
 
 /** Make sure that the WordPress bootstrap has run before continuing. */
-require(dirname(__FILE__) . '/wp-load.php');
+require( dirname(__FILE__) . '/wp-load.php' );
 
 /** This filter is documented in wp-admin/options.php */
 if ( ! apply_filters( 'enable_post_by_email_configuration', true ) )
@@ -25,38 +25,38 @@ do_action( 'wp-mail.php' );
 require_once( ABSPATH . WPINC . '/class-pop3.php' );
 
 /** Only check at this interval for new messages. */
-if ( !defined('WP_MAIL_INTERVAL') )
-	define('WP_MAIL_INTERVAL', 300); // 5 minutes
+if ( ! defined( 'WP_MAIL_INTERVAL' ) )
+	define( 'WP_MAIL_INTERVAL', 300 ); // 5 minutes
 
-$last_checked = get_transient('mailserver_last_checked');
+$last_checked = get_transient( 'mailserver_last_checked' );
 
 if ( $last_checked )
-	wp_die(__('Slow down cowboy, no need to check for new mails so often!'));
+	wp_die( __( 'Slow down cowboy, no need to check for new mails so often!' ) );
 
-set_transient('mailserver_last_checked', true, WP_MAIL_INTERVAL);
+set_transient( 'mailserver_last_checked', true, WP_MAIL_INTERVAL );
 
-$time_difference = get_option('gmt_offset') * HOUR_IN_SECONDS;
+$time_difference = get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
 
 $phone_delim = '::';
 
 $pop3 = new POP3();
 
-if ( !$pop3->connect( get_option('mailserver_url'), get_option('mailserver_port') ) || !$pop3->user( get_option('mailserver_login') ) )
+if ( ! $pop3->connect( get_option( 'mailserver_url' ), get_option( 'mailserver_port' ) ) || ! $pop3->user( get_option( 'mailserver_login' ) ) )
 	wp_die( esc_html( $pop3->ERROR ) );
 
-$count = $pop3->pass( get_option('mailserver_pass') );
+$count = $pop3->pass( get_option( 'mailserver_pass' ) );
 
 if( false === $count )
 	wp_die( esc_html( $pop3->ERROR ) );
 
 if( 0 === $count ) {
 	$pop3->quit();
-	wp_die( __('There doesn’t seem to be any new mail.') );
+	wp_die( __( 'There doesn’t seem to be any new mail.' ) );
 }
 
 for ( $i = 1; $i <= $count; $i++ ) {
 
-	$message = $pop3->get($i);
+	$message = $pop3->get( $i );
 
 	$bodysignal = false;
 	$boundary = '';
@@ -66,45 +66,44 @@ for ( $i = 1; $i <= $count; $i++ ) {
 	$content_transfer_encoding = '';
 	$post_author = 1;
 	$author_found = false;
-	$dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
-	foreach ($message as $line) {
+	foreach ( $message as $line ) {
 		// Body signal.
-		if ( strlen($line) < 3 )
+		if ( strlen( $line ) < 3 )
 			$bodysignal = true;
 		if ( $bodysignal ) {
 			$content .= $line;
 		} else {
-			if ( preg_match('/Content-Type: /i', $line) ) {
-				$content_type = trim($line);
-				$content_type = substr($content_type, 14, strlen($content_type) - 14);
-				$content_type = explode(';', $content_type);
+			if ( preg_match( '/Content-Type: /i', $line ) ) {
+				$content_type = trim( $line );
+				$content_type = substr( $content_type, 14, strlen( $content_type ) - 14 );
+				$content_type = explode( ';', $content_type );
 				if ( ! empty( $content_type[1] ) ) {
-					$charset = explode('=', $content_type[1]);
-					$charset = ( ! empty( $charset[1] ) ) ? trim($charset[1]) : '';
+					$charset = explode( '=', $content_type[1] );
+					$charset = ( ! empty( $charset[1] ) ) ? trim( $charset[1] ) : '';
 				}
 				$content_type = $content_type[0];
 			}
-			if ( preg_match('/Content-Transfer-Encoding: /i', $line) ) {
-				$content_transfer_encoding = trim($line);
-				$content_transfer_encoding = substr($content_transfer_encoding, 27, strlen($content_transfer_encoding) - 27);
-				$content_transfer_encoding = explode(';', $content_transfer_encoding);
+			if ( preg_match( '/Content-Transfer-Encoding: /i', $line ) ) {
+				$content_transfer_encoding = trim( $line );
+				$content_transfer_encoding = substr( $content_transfer_encoding, 27, strlen( $content_transfer_encoding ) - 27 );
+				$content_transfer_encoding = explode( ';', $content_transfer_encoding );
 				$content_transfer_encoding = $content_transfer_encoding[0];
 			}
-			if ( ( $content_type == 'multipart/alternative' ) && ( false !== strpos($line, 'boundary="') ) && ( '' == $boundary ) ) {
-				$boundary = trim($line);
-				$boundary = explode('"', $boundary);
+			if ( ( 'multipart/alternative' == $content_type ) && ( false !== strpos( $line, 'boundary="' ) ) && ( '' == $boundary ) ) {
+				$boundary = trim( $line );
+				$boundary = explode( '"', $boundary );
 				$boundary = $boundary[1];
 			}
-			if (preg_match('/Subject: /i', $line)) {
-				$subject = trim($line);
-				$subject = substr($subject, 9, strlen($subject) - 9);
+			if ( preg_match( '/Subject: /i', $line ) ) {
+				$subject = trim( $line );
+				$subject = substr( $subject, 9, strlen( $subject ) - 9 );
 				// Captures any text in the subject before $phone_delim as the subject
 				if ( function_exists('iconv_mime_decode') ) {
-					$subject = iconv_mime_decode($subject, 2, get_option('blog_charset'));
+					$subject = iconv_mime_decode( $subject, 2, get_option( 'blog_charset' ) );
 				} else {
-					$subject = wp_iso_descrambler($subject);
+					$subject = wp_iso_descrambler( $subject );
 				}
-				$subject = explode($phone_delim, $subject);
+				$subject = explode( $phone_delim, $subject );
 				$subject = $subject[0];
 			}
 
@@ -113,14 +112,14 @@ for ( $i = 1; $i <= $count; $i++ ) {
 			 * otherwise use the site admin.
 			 */
 			if ( ! $author_found && preg_match( '/^(From|Reply-To): /', $line ) ) {
-				if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) )
+				if ( preg_match( '|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches ) )
 					$author = $matches[0];
 				else
-					$author = trim($line);
-				$author = sanitize_email($author);
-				if ( is_email($author) ) {
-					echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
-					$userdata = get_user_by('email', $author);
+					$author = trim( $line );
+				$author = sanitize_email( $author );
+				if ( is_email( $author ) ) {
+					echo '<p>' . sprintf( __( 'Author is %s' ), $author ) . '</p>';
+					$userdata = get_user_by( 'email', $author );
 					if ( ! empty( $userdata ) ) {
 						$post_author = $userdata->ID;
 						$author_found = true;
@@ -140,27 +139,27 @@ for ( $i = 1; $i <= $count; $i++ ) {
 
 	// Set $post_status based on $author_found and on author's publish_posts capability
 	if ( $author_found ) {
-		$user = new WP_User($post_author);
+		$user = new WP_User( $post_author );
 		$post_status = ( $user->has_cap('publish_posts') ) ? 'publish' : 'pending';
 	} else {
 		// Author not found in DB, set status to pending. Author already set to admin.
 		$post_status = 'pending';
 	}
 
-	$subject = trim($subject);
+	$subject = trim( $subject );
 
-	if ( $content_type == 'multipart/alternative' ) {
-		$content = explode('--'.$boundary, $content);
+	if ( 'multipart/alternative' == $content_type ) {
+		$content = explode( '--' . $boundary, $content );
 		$content = $content[2];
 
 		// Match case-insensitive content-transfer-encoding.
-		if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim) ) {
-			$content = explode($delim[0], $content);
+		if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim ) ) {
+			$content = explode( $delim[0], $content );
 			$content = $content[1];
 		}
-		$content = strip_tags($content, '<img><p><br><i><b><u><em><strong><strike><font><span><div>');
+		$content = strip_tags( $content, '<img><p><br><i><b><u><em><strong><strike><font><span><div>' );
 	}
-	$content = trim($content);
+	$content = trim( $content );
 
 	/**
 	 * Filters the original content of the email.
@@ -174,19 +173,19 @@ for ( $i = 1; $i <= $count; $i++ ) {
 	 */
 	$content = apply_filters( 'wp_mail_original_content', $content );
 
-	if ( false !== stripos($content_transfer_encoding, "quoted-printable") ) {
-		$content = quoted_printable_decode($content);
+	if ( false !== stripos( $content_transfer_encoding, "quoted-printable" ) ) {
+		$content = quoted_printable_decode( $content );
 	}
 
 	if ( function_exists('iconv') && ! empty( $charset ) ) {
-		$content = iconv($charset, get_option('blog_charset'), $content);
+		$content = iconv( $charset, get_option( 'blog_charset' ), $content );
 	}
 
 	// Captures any text in the body after $phone_delim as the body
-	$content = explode($phone_delim, $content);
+	$content = explode( $phone_delim, $content );
 	$content = empty( $content[1] ) ? $content[0] : $content[1];
 
-	$content = trim($content);
+	$content = trim( $content );
 
 	/**
 	 * Filters the content of the post submitted by email before saving.
@@ -197,16 +196,16 @@ for ( $i = 1; $i <= $count; $i++ ) {
 	 */
 	$post_content = apply_filters( 'phone_content', $content );
 
-	$post_title = xmlrpc_getposttitle($content);
+	$post_title = xmlrpc_getposttitle( $content );
 
-	if ($post_title == '') $post_title = $subject;
+	if ( '' == $post_title ) $post_title = $subject;
 
-	$post_category = array(get_option('default_email_category'));
+	$post_category = array( get_option( 'default_email_category' ) );
 
-	$post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status');
-	$post_data = wp_slash($post_data);
+	$post_data = compact( 'post_content', 'post_title', 'post_date', 'post_date_gmt', 'post_author', 'post_category', 'post_status' );
+	$post_data = wp_slash( $post_data );
 
-	$post_ID = wp_insert_post($post_data);
+	$post_ID = wp_insert_post( $post_data );
 	if ( is_wp_error( $post_ID ) )
 		echo "\n" . $post_ID->get_error_message();
 
@@ -226,7 +225,7 @@ for ( $i = 1; $i <= $count; $i++ ) {
 	echo "\n<p><strong>" . __( 'Author:' ) . '</strong> ' . esc_html( $post_author ) . '</p>';
 	echo "\n<p><strong>" . __( 'Posted title:' ) . '</strong> ' . esc_html( $post_title ) . '</p>';
 
-	if(!$pop3->delete($i)) {
+	if ( ! $pop3->delete( $i ) ) {
 		echo '<p>' . sprintf(
 			/* translators: %s: POP3 error */
 			__( 'Oops: %s' ),
@@ -244,4 +243,4 @@ for ( $i = 1; $i <= $count; $i++ ) {
 
 }
 
-$pop3->quit();
+$pop3->quit();
\ No newline at end of file