diff --git a/wp-mail.php b/wp-mail.php
index a106e66aed..0978952ec6 100644
--- a/wp-mail.php
+++ b/wp-mail.php
@@ -136,6 +136,7 @@ for ($i=1; $i <= $count; $i++) :
 	$post_status = 'publish';
 
 	$post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status');
+	$post_data = add_magic_quotes($post_data);
 
 	$post_ID = wp_insert_post($post_data);
 
@@ -150,23 +151,6 @@ for ($i=1; $i <= $count; $i++) :
 	echo "\n<p><b>Posted title:</b> $post_title<br />";
 	echo "\n<b>Posted content:</b><br /><pre>".$content.'</pre></p>';
 
-	if (!$post_categories) $post_categories[] = 1;
-	foreach ($post_categories as $post_category) :
-		$post_category = intval($post_category);
-
-		// Double check it's not there already
-		$exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_ID AND category_id = $post_category");
-
-		if (!$exists && $result) { 
-			$wpdb->query("
-			INSERT INTO $wpdb->post2cat
-			(post_id, category_id)
-			VALUES
-			($post_ID, $post_category)
-			");
-		}
-	endforeach;
-
 	if(!$pop3->delete($i)) {
 		echo '<p>Oops '.$pop3->ERROR.'</p></div>';
 		$pop3->reset();