diff --git a/app/soapbox/components/ui/textarea/textarea.tsx b/app/soapbox/components/ui/textarea/textarea.tsx
index 43d6efd20..e93229e6a 100644
--- a/app/soapbox/components/ui/textarea/textarea.tsx
+++ b/app/soapbox/components/ui/textarea/textarea.tsx
@@ -1,7 +1,7 @@
 import classNames from 'clsx';
 import React from 'react';
 
-interface ITextarea extends Pick<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'maxLength' | 'onChange' | 'required' | 'disabled' | 'rows' | 'readOnly'> {
+interface ITextarea extends Pick<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'maxLength' | 'onChange' | 'onKeyDown' | 'required' | 'disabled' | 'rows' | 'readOnly'> {
   /** Put the cursor into the input on mount. */
   autoFocus?: boolean,
   /** The initial text in the input. */
diff --git a/app/soapbox/features/account/components/header.tsx b/app/soapbox/features/account/components/header.tsx
index 21e44f33b..91e2685b7 100644
--- a/app/soapbox/features/account/components/header.tsx
+++ b/app/soapbox/features/account/components/header.tsx
@@ -66,6 +66,7 @@ const messages = defineMessages({
   removeFromFollowersConfirm: { id: 'confirmations.remove_from_followers.confirm', defaultMessage: 'Remove' },
   userEndorsed: { id: 'account.endorse.success', defaultMessage: 'You are now featuring @{acct} on your profile' },
   userUnendorsed: { id: 'account.unendorse.success', defaultMessage: 'You are no longer featuring @{acct}' },
+  composeEvent: { od: 'navigation.compose_event', defaultMessage: 'Create new event' },
 });
 
 interface IHeader {
@@ -207,6 +208,10 @@ const Header: React.FC<IHeader> = ({ account }) => {
     history.push('/search');
   };
 
+  const onComposeEvent = () => {
+    dispatch(openModal('COMPOSE_EVENT'));
+  };
+
   const onAvatarClick = () => {
     const avatar = normalizeAttachment({
       type: 'image',
@@ -291,6 +296,13 @@ const Header: React.FC<IHeader> = ({ account }) => {
         to: '/blocks',
         icon: require('@tabler/icons/ban.svg'),
       });
+      if (features.events) {
+        menu.push({
+          text: intl.formatMessage(messages.composeEvent),
+          action: onComposeEvent,
+          icon: require('@tabler/icons/calendar.svg'),
+        });
+      }
     } else {
       menu.push({
         text: intl.formatMessage(messages.mention, { name: account.username }),
diff --git a/app/soapbox/features/ui/components/modals/join-event-modal.tsx b/app/soapbox/features/ui/components/modals/join-event-modal.tsx
index e7014bbbf..a8f0e7368 100644
--- a/app/soapbox/features/ui/components/modals/join-event-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/join-event-modal.tsx
@@ -3,10 +3,11 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { joinEvent } from 'soapbox/actions/events';
 import { closeModal } from 'soapbox/actions/modals';
-import { Modal, Text } from 'soapbox/components/ui';
+import { FormGroup, Modal, Textarea } from 'soapbox/components/ui';
 import { useAppDispatch } from 'soapbox/hooks';
 
 const messages = defineMessages({
+  hint: { id: 'join_event.hint', defaultMessage: 'You can tell the organizer why do you want to participate in this event:' },
   placeholder: { id: 'join_event.placeholder', defaultMessage: 'Message to organizer' },
   join: { id: 'join_event.join', defaultMessage: 'Request join' },
 });
@@ -51,19 +52,16 @@ const AccountNoteModal: React.FC<IAccountNoteModal> = ({ statusId }) => {
       confirmationText={intl.formatMessage(messages.join)}
       confirmationDisabled={isSubmitting}
     >
-      <Text theme='muted'>
-        <FormattedMessage id='join_event.hint' defaultMessage='You can tell the organizer why do you want to participate in this event:' />
-      </Text>
-
-      <textarea
-        className='setting-text light'
-        placeholder={intl.formatMessage(messages.placeholder)}
-        value={participationMessage}
-        onChange={handleChange}
-        onKeyDown={handleKeyDown}
-        disabled={isSubmitting}
-        autoFocus
-      />
+      <FormGroup labelText={intl.formatMessage(messages.hint)}>
+        <Textarea
+          placeholder={intl.formatMessage(messages.placeholder)}
+          value={participationMessage}
+          onChange={handleChange}
+          onKeyDown={handleKeyDown}
+          disabled={isSubmitting}
+          autoFocus
+        />
+      </FormGroup>
     </Modal>
   );
 };
diff --git a/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx
index f0e5d562b..77bfe4c98 100644
--- a/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx
@@ -20,8 +20,6 @@ const messages = defineMessages({
   blankslate: { id: 'report.reason.blankslate', defaultMessage: 'You have removed all statuses from being selected.' },
   done: { id: 'report.done', defaultMessage: 'Done' },
   next: { id: 'report.next', defaultMessage: 'Next' },
-  close: { id: 'lightbox.close', defaultMessage: 'Close' },
-  placeholder: { id: 'report.placeholder', defaultMessage: 'Additional comments' },
   submit: { id: 'report.submit', defaultMessage: 'Submit' },
 });
 
diff --git a/app/soapbox/normalizers/admin_report.ts b/app/soapbox/normalizers/admin_report.ts
index 23a60bc04..acf6786b1 100644
--- a/app/soapbox/normalizers/admin_report.ts
+++ b/app/soapbox/normalizers/admin_report.ts
@@ -24,7 +24,7 @@ export const AdminReportRecord = ImmutableRecord({
   rules: ImmutableList<string>(),
   statuses: ImmutableList<EmbeddedEntity<Status>>(),
   target_account: null as EmbeddedEntity<Account | ReducerAccount>,
-  updated_at:  new Date(),
+  updated_at: new Date(),
 });
 
 const normalizePleromaReport = (report: ImmutableMap<string, any>) => {
diff --git a/app/soapbox/service_worker/web_push_notifications.ts b/app/soapbox/service_worker/web_push_notifications.ts
index fe3d8e652..af14c711a 100644
--- a/app/soapbox/service_worker/web_push_notifications.ts
+++ b/app/soapbox/service_worker/web_push_notifications.ts
@@ -140,7 +140,7 @@ const handlePush = (event: PushEvent) => {
   event.waitUntil(
     fetchFromApi(`/api/v1/notifications/${notification_id}`, 'get', access_token).then(notification => {
       const options: ExtendedNotificationOptions = {
-        title: formatMessage(`notification.${notification.type}`, preferred_locale, { name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username }),
+        title:     formatMessage(`notification.${notification.type}`, preferred_locale, { name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username }),
         body:      notification.status && htmlToPlainText(notification.status.content),
         icon:      notification.account.avatar_static,
         timestamp: notification.created_at && Number(new Date(notification.created_at)),
diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index 3cb7e98dc..6a16295ed 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -279,6 +279,8 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     ethereumLogin: v.software === MITRA,
 
+    events: v.software === PLEROMA && v.build === SOAPBOX && gte(v.version, '2.4.50'),
+
     /**
      * Ability to address recipients of a status explicitly (with `to`).
      * @see POST /api/v1/statuses