Avoid use of JB+ APIs; ensure runtime compatability with ICS

Change-Id: I6ed595029a8dfb00c52f00f76964543990e3723a
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index ead3b30..41157eb 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -452,7 +452,7 @@
         if (action == COMPOSE) {
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
         } else if (message != null) {
-            intent.setDataAndNormalize(message.uri);
+            intent.setData(Utils.normalizeUri(message.uri));
         }
         context.startActivity(intent);
     }
@@ -463,7 +463,7 @@
         intent.putExtra(EXTRA_FROM_EMAIL_TASK, true);
         intent.putExtra(Utils.EXTRA_ACCOUNT, account);
         if (mailto != null) {
-            intent.setDataAndNormalize(mailto);
+            intent.setData(Utils.normalizeUri(mailto));
         }
         context.startActivity(intent);
     }