diff --git a/src/engine/rfc822/rfc822-message-data.vala b/src/engine/rfc822/rfc822-message-data.vala
index 43cc0223..c81ac4a6 100644
--- a/src/engine/rfc822/rfc822-message-data.vala
+++ b/src/engine/rfc822/rfc822-message-data.vala
@@ -262,8 +262,9 @@ public class Geary.RFC822.MessageIDList :
 
     public string to_rfc822_string() {
         string[] strings = new string[list.size];
-        for(int i = 0; i < this.list.size; ++i)
+        for (int i = 0; i < this.list.size; ++i) {
             strings[i] = this.list[i].to_rfc822_string();
+        }
 
         return string.joinv(" ", strings);
     }
diff --git a/src/engine/rfc822/rfc822-utils.vala b/src/engine/rfc822/rfc822-utils.vala
index 4e7d5b05..feb377eb 100644
--- a/src/engine/rfc822/rfc822-utils.vala
+++ b/src/engine/rfc822/rfc822-utils.vala
@@ -74,10 +74,12 @@ namespace Geary.RFC822.Utils {
         if (first != null) {
             result.add_all(first.get_all());
             // Add addresses from second that aren't in first.
-            if (second != null)
-                foreach (MailboxAddress address in second)
-            if (!first.contains_normalized(address.address))
-                result.add(address);
+            if (second != null) {
+                foreach (MailboxAddress address in second) {
+                    if (!first.contains_normalized(address.address))
+                        result.add(address);
+                }
+            }
         } else if (second != null) {
             result.add_all(second.get_all());
         }