diff --git a/appengine/mail/src/main/java/com/example/appengine/mail/BounceHandlerServlet.java b/appengine/mail/src/main/java/com/example/appengine/mail/BounceHandlerServlet.java
index 0868f5b9c1e..b46eecae1e1 100644
--- a/appengine/mail/src/main/java/com/example/appengine/mail/BounceHandlerServlet.java
+++ b/appengine/mail/src/main/java/com/example/appengine/mail/BounceHandlerServlet.java
@@ -29,7 +29,7 @@
 
 public class BounceHandlerServlet extends HttpServlet {
 
-	private static final Logger log = Logger.getLogger(BounceHandlerServlet.class.getName());
+  private static final Logger log = Logger.getLogger(BounceHandlerServlet.class.getName());
 
   @Override
   public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
diff --git a/appengine/mail/src/main/java/com/example/appengine/mail/HandleDiscussionEmail.java b/appengine/mail/src/main/java/com/example/appengine/mail/HandleDiscussionEmail.java
index d1db81cf5c8..104714738eb 100644
--- a/appengine/mail/src/main/java/com/example/appengine/mail/HandleDiscussionEmail.java
+++ b/appengine/mail/src/main/java/com/example/appengine/mail/HandleDiscussionEmail.java
@@ -16,7 +16,6 @@
 
 package com.example.appengine.mail;
 
-// [START example]
 import javax.mail.internet.MimeMessage;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -24,16 +23,17 @@
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 
+// [START example]
 public class HandleDiscussionEmail extends MailHandlerBase {
 
-	private static final Logger log = Logger.getLogger(HandleDiscussionEmail.class.getName());
+  private static final Logger log = Logger.getLogger(HandleDiscussionEmail.class.getName());
   public HandleDiscussionEmail() { super("discuss-(.*)@(.*)"); }
 
   @Override
   protected boolean processMessage(HttpServletRequest req, HttpServletResponse res)
     throws ServletException
   {
-  	log.info("Received e-mail sent to discuss list.");
+    log.info("Received e-mail sent to discuss list.");
     MimeMessage msg = getMessageFromRequest(req);
     Matcher match = getMatcherFromRequest(req);
     // ...