diff --git a/src/components/bulk-email-tool/bulk-email-form/TaskAlertModal.jsx b/src/components/bulk-email-tool/bulk-email-form/TaskAlertModal.jsx
index 6044d9b..72598ac 100644
--- a/src/components/bulk-email-tool/bulk-email-form/TaskAlertModal.jsx
+++ b/src/components/bulk-email-tool/bulk-email-form/TaskAlertModal.jsx
@@ -35,7 +35,14 @@ function TaskAlertModal(props) {
               id="bulk.email.form.recipients.Contine"
               defaultMessage="Continue"
               description="Continue button for the task alert"
-            />
+            >
+              { // FormattedMessage wraps the translated string in a <span/> by default. This was
+                // causing strange click event target issues in safari. To solve this, we want to
+                // wrap the string in a fragment instead of a span, so that the whole button considered
+                // a "button" target, and not a "span inside a button"
+                msg => <>{msg}</>
+              }
+            </FormattedMessage>
           </Button>
         </ActionRow>
       )}
diff --git a/src/components/bulk-email-tool/text-editor/TextEditor.jsx b/src/components/bulk-email-tool/text-editor/TextEditor.jsx
index 249f4a8..1e98fc8 100644
--- a/src/components/bulk-email-tool/text-editor/TextEditor.jsx
+++ b/src/components/bulk-email-tool/text-editor/TextEditor.jsx
@@ -33,9 +33,9 @@ export default function TextEditor(props) {
         height: 600,
         branding: false,
         menubar: 'edit view insert format table tools',
-        plugins: 'advlist code link lists table image language codesample',
+        plugins: 'advlist code link lists table image codesample',
         toolbar:
-          'formatselect fontselect bold italic underline forecolor | codesample bullist numlist alignleft aligncenter alignright alignjustify indent | blockquote link image code | language',
+          'formatselect fontselect bold italic underline forecolor | codesample bullist numlist alignleft aligncenter alignright alignjustify indent | blockquote link image code ',
         skin: false,
         content_css: false,
         content_style: `${contentUiCss.toString()}\n${contentCss.toString()}`,