diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml
index 0a5e6a2061..78e113aa62 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.ui.xml
@@ -32,7 +32,8 @@ limitations under the License.
       color: #ffffff;
       font-family: arial,sans-serif;
       font-weight: bold;
-      overflow: hidden;
+      overflow: auto !important;
+      bottom: 0;
       text-align: left;
       text-shadow: 1px 1px 7px #000000;
       min-width: 300px;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.ui.xml
index b5b0b016a8..5fa3f16f0c 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.ui.xml
@@ -32,7 +32,8 @@ limitations under the License.
       color: #ffffff;
       font-family: arial,sans-serif;
       font-weight: bold;
-      overflow: hidden;
+      overflow: auto !important;
+      bottom: 0;
       text-align: left;
       text-shadow: 1px 1px 7px #000000;
       min-width: 300px;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmailValidator.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmailValidator.java
index 956b69357c..5ab5f4e3db 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmailValidator.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmailValidator.java
@@ -19,15 +19,12 @@ import static org.apache.commons.validator.routines.DomainValidator.ArrayType.GE
 import org.apache.commons.validator.routines.DomainValidator;
 import org.apache.commons.validator.routines.EmailValidator;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
 public class OutgoingEmailValidator {
-  private static final AtomicBoolean initialized = new AtomicBoolean(false);
+  static {
+    DomainValidator.updateTLDOverride(GENERIC_PLUS, new String[]{"local"});
+  }
 
   public static boolean isValid(String addr) {
-    if (!initialized.getAndSet(true)) {
-      DomainValidator.updateTLDOverride(GENERIC_PLUS, new String[]{"local"});
-    }
     return EmailValidator.getInstance(true, true).isValid(addr);
   }
 }
diff --git a/lib/JGIT_VERSION b/lib/JGIT_VERSION
index 83a2d7aa4d..5817fe8dcf 100644
--- a/lib/JGIT_VERSION
+++ b/lib/JGIT_VERSION
@@ -1,6 +1,6 @@
 include_defs('//lib/maven.defs')
 
 REPO = GERRIT # Leave here even if set to MAVEN_CENTRAL.
-VERS = '4.4.1.201607150455-r.144-gb67df51'
+VERS = '4.4.1.201607150455-r.148-gabeaafc'
 DOC_VERS = '4.4.1.201607150455-r' # Set to VERS unless using a snapshot
 JGIT_DOC_URL="http://download.eclipse.org/jgit/site/" + DOC_VERS + "/apidocs"
diff --git a/lib/jgit/org.eclipse.jgit.archive/BUCK b/lib/jgit/org.eclipse.jgit.archive/BUCK
index 4a60b16718..af0284f47a 100644
--- a/lib/jgit/org.eclipse.jgit.archive/BUCK
+++ b/lib/jgit/org.eclipse.jgit.archive/BUCK
@@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION')
 maven_jar(
   name = 'jgit-archive',
   id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS,
-  sha1 = 'abaee87ff5d85ff0f32de5e56669063b73e5fae0',
+  sha1 = '73c3dd7d57c54b4ec95db6325e2d51dd3a0e6036',
   license = 'jgit',
   repository = REPO,
   deps = ['//lib/jgit/org.eclipse.jgit:jgit'],
diff --git a/lib/jgit/org.eclipse.jgit.http.server/BUCK b/lib/jgit/org.eclipse.jgit.http.server/BUCK
index 2b5ad6eae8..c93ea99300 100644
--- a/lib/jgit/org.eclipse.jgit.http.server/BUCK
+++ b/lib/jgit/org.eclipse.jgit.http.server/BUCK
@@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION')
 maven_jar(
   name = 'jgit-servlet',
   id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS,
-  sha1 = 'a48e93266eb4a7a04a1767d6a16d2f0acf11402a',
+  sha1 = 'a85e11f0f31f71a4e4e83313c4c24167e99d330c',
   license = 'jgit',
   repository = REPO,
   deps = ['//lib/jgit/org.eclipse.jgit:jgit'],
diff --git a/lib/jgit/org.eclipse.jgit.junit/BUCK b/lib/jgit/org.eclipse.jgit.junit/BUCK
index 09b072ee6e..9d4a2dd61e 100644
--- a/lib/jgit/org.eclipse.jgit.junit/BUCK
+++ b/lib/jgit/org.eclipse.jgit.junit/BUCK
@@ -4,7 +4,7 @@ include_defs('//lib/JGIT_VERSION')
 maven_jar(
   name = 'junit',
   id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS,
-  sha1 = 'ccd60b0f344e98af051449c52542a18576cf69ba',
+  sha1 = 'cd7e83bb138d0c3dad9d2dea27c238824d056a4b',
   license = 'DO_NOT_DISTRIBUTE',
   repository = REPO,
   unsign = True,
diff --git a/lib/jgit/org.eclipse.jgit/BUCK b/lib/jgit/org.eclipse.jgit/BUCK
index 3cc27f7993..da1ad9a96d 100644
--- a/lib/jgit/org.eclipse.jgit/BUCK
+++ b/lib/jgit/org.eclipse.jgit/BUCK
@@ -4,8 +4,8 @@ include_defs('//lib/JGIT_VERSION')
 maven_jar(
   name = 'jgit',
   id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS,
-  bin_sha1 = 'b28b6e0d14adfcf0a3afcf4002fe16dc2cc3e453',
-  src_sha1 = '362c6913beb90a278c5cd479f7536813fe007b60',
+  bin_sha1 = '0bbcd8846f2731e50fccfb9f3ced43e2298844d4',
+  src_sha1 = '72d8aa79f8e645bb44f9f2fe74d02c6021516261',
   license = 'jgit',
   repository = REPO,
   unsign = True,