diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000..653f187e48
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,9 @@
+{
+    "editor.tabSize": 2,
+    "editor.formatOnSave": false,
+    "dart.enableSdkFormatter": false,
+    "[dart]": {
+        "editor.formatOnSave": false,
+        "editor.tabSize": 2,
+    }
+}
\ No newline at end of file
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 87ea3850cb..c7065a47ba 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -124,4 +124,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 985e5b058f26709dc81f9ae74ea2b2775bdbcefe
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/lib/widgets/lightbox.dart b/lib/widgets/lightbox.dart
index e68e15a64d..a0adae0271 100644
--- a/lib/widgets/lightbox.dart
+++ b/lib/widgets/lightbox.dart
@@ -140,12 +140,32 @@ class _LightboxPageState extends State<_LightboxPage> {
         .add_Hms()
         .format(DateTime.fromMillisecondsSinceEpoch(widget.message.timestamp * 1000));
 
+      final avatarUrl = widget.message.avatarUrl == null // TODO get from user data
+        ? null // TODO handle computing gravatars
+        : resolveUrl(widget.message.avatarUrl!, PerAccountStoreWidget.of(context).account,
+        );
+
+      final avatar = avatarUrl != null
+        ? Padding(
+            padding: const EdgeInsets.fromLTRB(8.0,4,0,0),
+            child: Container(
+              clipBehavior: Clip.antiAlias,
+              width: 35,
+              height: 35,
+              decoration: const BoxDecoration(
+              borderRadius: BorderRadius.all(Radius.circular(4))),
+              child: RealmContentNetworkImage(avatarUrl),
+            ),
+          )
+        : const SizedBox.shrink();
+
+
       appBar = AppBar(
         centerTitle: false,
         foregroundColor: appBarForegroundColor,
         backgroundColor: appBarBackgroundColor,
-
-        // TODO(#41): Show message author's avatar
+        leading: avatar,
+        actions: const [CloseButton()],
         title: RichText(
           text: TextSpan(children: [
             TextSpan(
@@ -205,7 +225,7 @@ class _LightboxPageState extends State<_LightboxPage> {
 Route getLightboxRoute({
   required BuildContext context,
   required Message message,
-  required String src
+  required String src,
 }) {
   return AccountPageRouteBuilder(
     context: context,
diff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart
index 11c6401e43..d143c33aa9 100644
--- a/lib/widgets/message_list.dart
+++ b/lib/widgets/message_list.dart
@@ -381,7 +381,8 @@ class MessageWithSender extends StatelessWidget {
                 borderRadius: BorderRadius.all(Radius.circular(4))),
               width: 35,
               height: 35,
-              child: avatar)),
+              child: avatar,
+            )),
           Expanded(
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.stretch,