diff --git a/src/client/components/components-web-view.vala b/src/client/components/components-web-view.vala
index 6e2dfcb8..06e76572 100644
--- a/src/client/components/components-web-view.vala
+++ b/src/client/components/components-web-view.vala
@@ -77,12 +77,15 @@ public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface {
      */
     public static void init_web_context(Application.Configuration config,
                                         File web_extension_dir,
-                                        File cache_dir) {
+                                        File cache_dir,
+                                        bool sandboxed=true) {
         WebsiteDataManager data_manager = new WebsiteDataManager(cache_dir.get_path());
         WebKit.WebContext context = new WebKit.WebContext.with_website_data_manager(data_manager);
         // Enable WebProcess sandboxing
-        context.add_path_to_sandbox(web_extension_dir.get_path(), true);
-        context.set_sandbox_enabled(true);
+        if (sandboxed) {
+            context.add_path_to_sandbox(web_extension_dir.get_path(), true);
+            context.set_sandbox_enabled(true);
+        }
         // Use the doc browser model so that we get some caching of
         // resources between email body loads.
         context.set_cache_model(WebKit.CacheModel.DOCUMENT_BROWSER);
diff --git a/test/client/components/components-web-view-test-case.vala b/test/client/components/components-web-view-test-case.vala
index 04f1c79f..08d94588 100644
--- a/test/client/components/components-web-view-test-case.vala
+++ b/test/client/components/components-web-view-test-case.vala
@@ -22,7 +22,8 @@ public abstract class Components.WebViewTestCase<V> : TestCase {
         WebView.init_web_context(
             this.config,
             File.new_for_path(_BUILD_ROOT_DIR).get_child("src"),
-            File.new_for_path("/tmp") // XXX use something better here
+            File.new_for_path("/tmp"), // XXX use something better here
+            false // https://bugs.webkit.org/show_bug.cgi?id=213174
         );
         try {
             WebView.load_resources(GLib.File.new_for_path("/tmp"));
diff --git a/test/client/components/components-web-view-test.vala b/test/client/components/components-web-view-test.vala
index d3e1037c..61d6340b 100644
--- a/test/client/components/components-web-view-test.vala
+++ b/test/client/components/components-web-view-test.vala
@@ -21,7 +21,8 @@ public class Components.WebViewTest : TestCase {
         WebView.init_web_context(
             config,
             File.new_for_path(_BUILD_ROOT_DIR).get_child("src"),
-            File.new_for_path("/tmp") // XXX use something better here
+            File.new_for_path("/tmp"), // XXX use something better here
+            false // https://bugs.webkit.org/show_bug.cgi?id=213174
         );
     }