am 4e016f20: am 983b837e: Merge change 23510 into eclair

Merge commit '4e016f200094d262040d82559f3833dc809a4db8'

* commit '4e016f200094d262040d82559f3833dc809a4db8':
  SMS-to-email fix for messages from the web

telephony/java/com/android/internal/telephony/SmsMessageBase.java

@@ -383,7 +383,7 @@ public abstract class SmsMessageBase {
          * 2. [x@y][ ]/[body]
          */
          String[] parts = messageBody.split("( /)|( )", 2);
-         if (parts.length < 1 || parts[0].indexOf('@') == -1) return;
+         if (parts.length < 1) return;
          emailFrom = parts[0];
          emailBody = parts[1];
          isEmail = true;