diff --git a/preload.js b/preload.js
index 2f250136d..24757e0d0 100644
--- a/preload.js
+++ b/preload.js
@@ -62,6 +62,7 @@ window.lokiFeatureFlags = {
   useFileOnionRequestsV2: true, // more compact encoding of files in response
   onionRequestHops: 3,
   useRequestEncryptionKeyPair: false,
+  padOutgoingAttachments: false,
 };
 
 if (
diff --git a/ts/components/UserDetailsDialog.tsx b/ts/components/UserDetailsDialog.tsx
index 70e4e0301..70276c53d 100644
--- a/ts/components/UserDetailsDialog.tsx
+++ b/ts/components/UserDetailsDialog.tsx
@@ -64,7 +64,7 @@ export class UserDetailsDialog extends React.Component<Props, State> {
   private renderAvatar() {
     const { avatarPath, pubkey, profileName } = this.props;
     const size = this.state.isEnlargedImageShown ? 300 : 80;
-    const userName = name || profileName || pubkey;
+    const userName = profileName || pubkey;
 
     return (
       <Avatar
diff --git a/ts/session/utils/Attachments.ts b/ts/session/utils/Attachments.ts
index 97e99b4e5..ba21e940b 100644
--- a/ts/session/utils/Attachments.ts
+++ b/ts/session/utils/Attachments.ts
@@ -93,9 +93,10 @@ export class AttachmentUtils {
       pointer.key = new Uint8Array(crypto.randomBytes(64));
       const iv = new Uint8Array(crypto.randomBytes(16));
 
-      const dataToEncrypt = !shouldPad
-        ? attachment.data
-        : AttachmentUtils.addAttachmentPadding(attachment.data);
+      const dataToEncrypt =
+        !shouldPad || !window.lokiFeatureFlags.padOutgoingAttachments
+          ? attachment.data
+          : AttachmentUtils.addAttachmentPadding(attachment.data);
       const data = await window.textsecure.crypto.encryptAttachment(
         dataToEncrypt,
         pointer.key.buffer,
diff --git a/ts/session/utils/JobQueue.ts b/ts/session/utils/JobQueue.ts
index 7293e8fe7..6142fc3fb 100644
--- a/ts/session/utils/JobQueue.ts
+++ b/ts/session/utils/JobQueue.ts
@@ -4,7 +4,7 @@ type Job<ResultType> = (() => PromiseLike<ResultType>) | (() => ResultType);
 
 // TODO: This needs to replace js/modules/job_queue.js
 export class JobQueue {
-  private pending: Promise<any> = Promise.resolve();
+  private pending?: Promise<any> = Promise.resolve();
   private readonly jobs: Map<string, Promise<unknown>> = new Map();
 
   public has(id: string): boolean {
diff --git a/ts/window.d.ts b/ts/window.d.ts
index ea0eb1920..e3a1f6e1f 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -62,6 +62,7 @@ declare global {
       useFileOnionRequestsV2: boolean;
       onionRequestHops: number;
       useRequestEncryptionKeyPair: boolean;
+      padOutgoingAttachments: boolean;
     };
     lokiFileServerAPI: LokiFileServerInstance;
     lokiMessageAPI: LokiMessageInterface;