diff --git a/wp-mail.php b/wp-mail.php
index 4dc4ed019..38c0d2bf3 100644
--- a/wp-mail.php
+++ b/wp-mail.php
@@ -13,11 +13,23 @@ require(dirname(__FILE__) . '/wp-load.php');
 /** Get the POP3 class with which to access the mailbox. */
 require_once( ABSPATH . WPINC . '/class-pop3.php' );
 
+/** Only check at this interval for new messages. */
+if ( !defined('WP_MAIL_INTERVAL') )
+	define('WP_MAIL_INTERVAL', 500); // 5 minutes
+
+$last_checked = get_transient('mailserver_last_checked');
+
+if ( $last_checked )
+	wp_die(__('Slow down cowboy, no need to check for new mails so often!'));
+
+set_transient('mailserver_last_checked', true, WP_MAIL_INTERVAL);
+
 $time_difference = get_option('gmt_offset') * 3600;
 
 $phone_delim = '::';
 
 $pop3 = new POP3();
+$count = 0;
 
 if ( ! $pop3->connect(get_option('mailserver_url'), get_option('mailserver_port') ) ||
 	! $pop3->user(get_option('mailserver_login')) ||