diff --git a/go/libkb/version.go b/go/libkb/version.go
index cc49f30461c5..78a4b4f0a7f5 100644
--- a/go/libkb/version.go
+++ b/go/libkb/version.go
@@ -4,4 +4,4 @@
 package libkb
 
 // Version is the current version (should be MAJOR.MINOR.PATCH)
-const Version = "6.4.0"
+const Version = "6.4.2"
diff --git a/shared/android/app/build.gradle b/shared/android/app/build.gradle
index 5694bda25ae6..ad4832a4be8d 100644
--- a/shared/android/app/build.gradle
+++ b/shared/android/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: "com.facebook.react"
 apply plugin: 'com.github.triplet.play'
 
 // KB: app version
-def VERSION_NAME = "6.4.0"
+def VERSION_NAME = "6.4.2"
 
 // KB: Number of commits, like ios
 Integer getVersionCode() {
diff --git a/shared/chat/conversation/messages/attachment/shared.tsx b/shared/chat/conversation/messages/attachment/shared.tsx
index 842dd7c5de86..8f16583e14ec 100644
--- a/shared/chat/conversation/messages/attachment/shared.tsx
+++ b/shared/chat/conversation/messages/attachment/shared.tsx
@@ -11,7 +11,7 @@ type Props = {
 }
 
 // this is a function of how much space is taken up by the rest of the elements
-export const maxWidth = Kb.Styles.isMobile ? Math.min(320, Kb.Styles.dimensionWidth - 60) : 320
+export const maxWidth = Kb.Styles.isMobile ? Math.min(356, Kb.Styles.dimensionWidth - 70) : 356
 export const maxHeight = 320
 
 export const missingMessage = C.Chat.makeMessageAttachment()
diff --git a/shared/chat/conversation/messages/attachment/video/index.tsx b/shared/chat/conversation/messages/attachment/video/index.tsx
index a3f032f922b7..c67c3326f70f 100644
--- a/shared/chat/conversation/messages/attachment/video/index.tsx
+++ b/shared/chat/conversation/messages/attachment/video/index.tsx
@@ -77,11 +77,15 @@ const Video = React.memo(function Video(p: Props) {
 const styles = Kb.Styles.styleSheetCreate(
   () =>
     ({
-      container: {alignSelf: 'center', paddingRight: Kb.Styles.globalMargins.tiny, position: 'relative'},
+      container: {
+        alignSelf: 'center',
+        paddingRight: Kb.Styles.isMobile ? 0 : Kb.Styles.globalMargins.tiny,
+        position: 'relative',
+      },
       contentContainer: {
         backgroundColor: Kb.Styles.globalColors.black_05_on_white,
         borderRadius: Kb.Styles.borderRadius,
-        maxWidth: Kb.Styles.isMobile ? '100%' : 330,
+        maxWidth: Kb.Styles.isMobile ? '100%' : 356 + 3 * 2,
         padding: 3,
         position: 'relative',
       },
diff --git a/shared/chat/conversation/messages/attachment/video/use-state.tsx b/shared/chat/conversation/messages/attachment/video/use-state.tsx
index 17a61dfb47dd..9b4a90c4f92f 100644
--- a/shared/chat/conversation/messages/attachment/video/use-state.tsx
+++ b/shared/chat/conversation/messages/attachment/video/use-state.tsx
@@ -11,16 +11,7 @@ export const useState = () => {
       const message = m?.type === 'attachment' ? m : missingMessage
       const {previewURL, previewHeight, previewWidth} = message
       const {fileURL, downloadPath, transferState, videoDuration} = message
-      const vertical = previewHeight > previewWidth
-      // the native av controls on ios actually clip themselves if the width is too small so give
-      // some extra room in this case
-      const extra = C.isIOS && vertical ? 75 : 0
-      const {height, width} = C.Chat.clampImageSize(
-        previewWidth,
-        previewHeight,
-        maxWidth + extra,
-        maxHeight + extra
-      )
+      const {height, width} = C.Chat.clampImageSize(previewWidth, previewHeight, maxWidth, maxHeight)
       return {downloadPath, height, previewURL, transferState, url: fileURL, videoDuration, width}
     })
   )
diff --git a/shared/chat/conversation/messages/attachment/video/videoimpl.desktop.tsx b/shared/chat/conversation/messages/attachment/video/videoimpl.desktop.tsx
index e3a12c6cc96e..28b6c650569b 100644
--- a/shared/chat/conversation/messages/attachment/video/videoimpl.desktop.tsx
+++ b/shared/chat/conversation/messages/attachment/video/videoimpl.desktop.tsx
@@ -2,6 +2,7 @@ import * as Kb from '@/common-adapters'
 import * as React from 'react'
 import type {Props} from './videoimpl'
 import {useState} from './use-state'
+import {maxWidth, maxHeight} from '../shared'
 
 // its important we use explicit height/width so we never CLS while loading
 const VideoImpl = (p: Props) => {
@@ -107,8 +108,8 @@ const styles = Kb.Styles.styleSheetCreate(
       video: Kb.Styles.platformStyles({
         isElectron: {
           ...Kb.Styles.globalStyles.rounded,
-          maxHeight: 320,
-          maxWidth: 320,
+          maxHeight,
+          maxWidth,
           objectFit: 'contain',
         },
       }),
diff --git a/shared/chat/conversation/messages/attachment/video/videoimpl.native.tsx b/shared/chat/conversation/messages/attachment/video/videoimpl.native.tsx
index 0b46f657f31f..7f2940eef95a 100644
--- a/shared/chat/conversation/messages/attachment/video/videoimpl.native.tsx
+++ b/shared/chat/conversation/messages/attachment/video/videoimpl.native.tsx
@@ -107,7 +107,9 @@ const styles = Kb.Styles.styleSheetCreate(
         position: 'relative',
         width: '100%',
       },
-      video: {},
+      video: {
+        alignSelf: 'center',
+      },
     }) as const
 )
 
diff --git a/shared/ios/Keybase/Info.plist b/shared/ios/Keybase/Info.plist
index 2ffe1827b573..20acd5112da7 100644
--- a/shared/ios/Keybase/Info.plist
+++ b/shared/ios/Keybase/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.4.0</string>
+	<string>6.4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/shared/ios/KeybaseShare/Info.plist b/shared/ios/KeybaseShare/Info.plist
index 44d5a03568a9..4efa33159ed9 100644
--- a/shared/ios/KeybaseShare/Info.plist
+++ b/shared/ios/KeybaseShare/Info.plist
@@ -17,7 +17,7 @@
         <key>CFBundlePackageType</key>
         <string>XPC!</string>
         <key>CFBundleShortVersionString</key>
-        <string>6.4.0</string>
+        <string>6.4.2</string>
         <key>CFBundleVersion</key>
         <string>1</string>
         <key>NSExtension</key>