--- mailsave-orig/cleanup/mms_us_verizon/mms_us_verizon.inc	2007-05-30 15:34:46.000000000 -0600
+++ mailsave/cleanup/mms_us_verizon/mms_us_verizon.inc	2007-06-28 15:51:37.000000000 -0600
@@ -27,16 +27,28 @@ function mms_us_verizon_mailsave_clean(&
 
       // Store the amended body
       $node->body = $body;
+      
+      // Lets clean up if the author just puts the title in the body
+	  if (empty($node->title) && !empty($node->body) && strlen($node->body) <= 60) {
+		$node->title = $node->title = truncate_utf8($body, 60, TRUE, TRUE);
+		$node->body = "";
+	  }
+	  
+	  // What if there is no title and just a longer description
+      if (empty($node->title) && !empty($node->body)) $node->title = truncate_utf8($body, 60, TRUE, TRUE);
+      
+      // OK how about a really lazy author
+	  if (empty($node->title) && empty($node->body)) $node->title = "Mobile Submission";
+
+      // Get rid of extra text attachments
+      foreach ($node->mailsave_attachments as $key => $file) {
+        if ($file['filemime'] == 'text/plain') {
+          unset($node->mailsave_attachments[$key]);
+    	}
+      }
       $node->teaser = node_teaser($node->body);
-
-      // Replace generic title with portion of body
-      $node->title = truncate_utf8($body, 60, TRUE, TRUE);
-
-      // Discard text portion of message (is this filename always the same?)
-      mailsave_discard_attachment($node, 'smiltextpartfilename0.txt');
     }
   }
-
   return;
 }