diff --git a/src/com/fsck/k9/mail/Address.java b/src/com/fsck/k9/mail/Address.java
index 55ce55917..d7068edb3 100644
--- a/src/com/fsck/k9/mail/Address.java
+++ b/src/com/fsck/k9/mail/Address.java
@@ -388,7 +388,7 @@ public class Address
             addresses.add(new Address(address, personal));
             pairStartIndex = pairEndIndex + 2;
         }
-        return addresses.toArray(new Address[] { });
+        return addresses.toArray(new Address[addresses.size()]);
     }
 
     /**
@@ -405,7 +405,7 @@ public class Address
         {
             return null;
         }
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (int i = 0, count = addresses.length; i < count; i++)
         {
             Address address = addresses[i];