diff --git a/src/com/fsck/k9/mail/Address.java b/src/com/fsck/k9/mail/Address.java
index 3472cf6c1..dafc052d2 100644
--- a/src/com/fsck/k9/mail/Address.java
+++ b/src/com/fsck/k9/mail/Address.java
@@ -135,7 +135,7 @@ public class Address
         }
         try
         {
-            MailboxList parsedList = (MailboxList) AddressBuilder.parseAddressList(addressList).flatten();
+            MailboxList parsedList = AddressBuilder.parseAddressList(addressList).flatten();
             for (int i = 0, count = parsedList.size(); i < count; i++)
             {
                 org.apache.james.mime4j.dom.address.Address address = parsedList.get(i);
diff --git a/src/com/fsck/k9/mail/transport/SmtpTransport.java b/src/com/fsck/k9/mail/transport/SmtpTransport.java
index 38a306b9a..0e0c97fd5 100644
--- a/src/com/fsck/k9/mail/transport/SmtpTransport.java
+++ b/src/com/fsck/k9/mail/transport/SmtpTransport.java
@@ -30,7 +30,6 @@ import org.apache.commons.codec.binary.Hex;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 
 public class SmtpTransport extends Transport