diff --git a/src/main/org/apache/tools/ant/taskdefs/email/Message.java b/src/main/org/apache/tools/ant/taskdefs/email/Message.java
index 0e5449fbe..75b033adb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/Message.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/Message.java
@@ -119,27 +119,27 @@ public class Message extends ProjectComponent {
         BufferedWriter out = null;
         try {
             out
-            = charset != null ? new BufferedWriter(new OutputStreamWriter(ps, charset))
-                              : new BufferedWriter(new OutputStreamWriter(ps));
-        if (messageSource != null) {
-            // Read message from a file
-            FileReader freader = new FileReader(messageSource);
-
-            try {
-                BufferedReader in = new BufferedReader(freader);
-                String line = null;
-                while ((line = in.readLine()) != null) {
-                    out.write(getProject().replaceProperties(line));
-                    out.newLine();
+                = charset != null ? new BufferedWriter(new OutputStreamWriter(ps, charset))
+                : new BufferedWriter(new OutputStreamWriter(ps));
+            if (messageSource != null) {
+                // Read message from a file
+                FileReader freader = new FileReader(messageSource);
+
+                try {
+                    BufferedReader in = new BufferedReader(freader);
+                    String line = null;
+                    while ((line = in.readLine()) != null) {
+                        out.write(getProject().replaceProperties(line));
+                        out.newLine();
+                    }
+                } finally {
+                    freader.close();
                 }
-            } finally {
-                freader.close();
+            } else {
+                out.write(getProject().replaceProperties(buffer.substring(0)));
+                out.newLine();
             }
-        } else {
-            out.write(getProject().replaceProperties(buffer.substring(0)));
-            out.newLine();
-        }
-        out.flush();
+            out.flush();
         } finally {
             FileUtils.close(out);
         }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
index cc7f2c710..a0b540616 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
@@ -183,11 +183,11 @@ public class Cab extends MatchingTask {
         try {
             writer = new BufferedWriter(new FileWriter(listFile));
 
-        int size = files.size();
-        for (int i = 0; i < size; i++) {
-            writer.write('\"' + files.elementAt(i).toString() + '\"');
-            writer.newLine();
-        }
+            int size = files.size();
+            for (int i = 0; i < size; i++) {
+                writer.write('\"' + files.elementAt(i).toString() + '\"');
+                writer.newLine();
+            }
         } finally {
             FileUtils.close(writer);
         }