### Eclipse Workspace Patch 1.0
#P SVN - OnTime Drupal
Index: sites/all/modules/smtp/smtp.module
===================================================================
--- sites/all/modules/smtp/smtp.module	(revision 17591)
+++ sites/all/modules/smtp/smtp.module	(working copy)
@@ -759,22 +759,9 @@
  */
 function _smtp_remove_headers($input) {
   $part_array = explode("\n", $input);
-
-  if (strpos($part_array[0], 'Content') !== FALSE) {
-    if (strpos($part_array[1], 'Content') !== FALSE) {
-      if (strpos($part_array[2], 'Content') !== FALSE) {
-          array_shift($part_array);
-          array_shift($part_array);
-          array_shift($part_array);
-      }
-      else {
-        array_shift($part_array);
-        array_shift($part_array);
-      }
-    }
-    else {
-      array_shift($part_array);
-    }
+  
+  while(strpos($part_array[0], 'Content') !== FALSE){
+  	array_shift($part_array);
   }
 
   $output = implode("\n", $part_array);