diff --git a/lib/models/messages/textmessage.dart b/lib/models/messages/textmessage.dart
index 37375f8f..3bf538dc 100644
--- a/lib/models/messages/textmessage.dart
+++ b/lib/models/messages/textmessage.dart
@@ -1,10 +1,12 @@
 import 'package:cwtch/models/message.dart';
 import 'package:cwtch/widgets/messagebubble.dart';
 import 'package:cwtch/widgets/messagerow.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
 
 import '../../model.dart';
+import '../../settings.dart';
 
 class TextMessage extends Message {
   final MessageMetadata metadata;
diff --git a/lib/widgets/contactrow.dart b/lib/widgets/contactrow.dart
index fced6b79..0b607a14 100644
--- a/lib/widgets/contactrow.dart
+++ b/lib/widgets/contactrow.dart
@@ -23,10 +23,11 @@ class _ContactRowState extends State<ContactRow> {
         clipBehavior: Clip.antiAlias,
         color: Provider.of<AppState>(context).selectedConversation == contact.onion ? Provider.of<Settings>(context).theme.backgroundHilightElementColor() : null,
         borderOnForeground: false,
+        margin: EdgeInsets.all(0.0),
         child: InkWell(
           child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
             Padding(
-              padding: const EdgeInsets.all(2.0), //border size
+              padding: const EdgeInsets.all(6.0), //border size
               child: ProfileImage(
                   badgeCount: contact.unreadMessages,
                   badgeColor: Provider.of<Settings>(context).theme.portraitContactBadgeColor(),
diff --git a/lib/widgets/messagelist.dart b/lib/widgets/messagelist.dart
index 0ae041e6..d9474152 100644
--- a/lib/widgets/messagelist.dart
+++ b/lib/widgets/messagelist.dart
@@ -41,7 +41,9 @@ class _MessageListState extends State<MessageList> {
           child: Container(
             padding: EdgeInsets.all(5.0),
             color: Provider.of<Settings>(context).theme.defaultButtonActiveColor(),
-            child: showSyncing
+            child: DefaultTextStyle(
+              style: TextStyle(color:  Provider.of<Settings>(context).theme.defaultButtonTextColor()),
+              child: showSyncing
                 ? Text(AppLocalizations.of(context)!.serverNotSynced, textAlign: TextAlign.center)
                 : showOfflineWarning
                     ? Text(Provider.of<ContactInfoState>(context).isGroup ? AppLocalizations.of(context)!.serverConnectivityDisconnected : AppLocalizations.of(context)!.peerOfflineMessage,
@@ -52,7 +54,7 @@ class _MessageListState extends State<MessageList> {
                         :
                         // We are not allowed to put null here, so put an empty text widge
                         Text("")),
-          )),
+          ))),
       Expanded(
           child: Scrollbar(
               controller: ctrlr1,
diff --git a/lib/widgets/messagerow.dart b/lib/widgets/messagerow.dart
index 85c7a78d..2dbd260c 100644
--- a/lib/widgets/messagerow.dart
+++ b/lib/widgets/messagerow.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:cwtch/cwtch_icons_icons.dart';
 import 'package:cwtch/models/message.dart';
@@ -144,10 +145,10 @@ class MessageRowState extends State<MessageRow> {
         },
         child: GestureDetector(
 
-            // Swipe to quote
-            onHorizontalDragEnd: (details) {
+            // Swipe to quote on Android
+            onHorizontalDragEnd: Platform.isAndroid ? (details) {
               Provider.of<AppState>(context, listen: false).selectedIndex = Provider.of<MessageMetadata>(context, listen: false).messageIndex;
-            },
+            } : null,
             child: Padding(padding: EdgeInsets.all(2), child: Row(mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start, children: widgetRow))));
   }
 
diff --git a/lib/widgets/profilerow.dart b/lib/widgets/profilerow.dart
index de865c8e..0c987820 100644
--- a/lib/widgets/profilerow.dart
+++ b/lib/widgets/profilerow.dart
@@ -22,12 +22,13 @@ class _ProfileRowState extends State<ProfileRow> {
     var profile = Provider.of<ProfileInfoState>(context);
     return Card(
         clipBehavior: Clip.antiAlias,
+        margin: EdgeInsets.all(0.0),
         child: InkWell(
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               Padding(
-                  padding: const EdgeInsets.all(2.0), //border size
+                  padding: const EdgeInsets.all(6.0), //border size
                   child: ProfileImage(
                       badgeCount: 0,
                       badgeColor: Provider.of<Settings>(context).theme.portraitProfileBadgeColor(),
diff --git a/lib/widgets/quotedmessage.dart b/lib/widgets/quotedmessage.dart
index 466325b6..922e7e34 100644
--- a/lib/widgets/quotedmessage.dart
+++ b/lib/widgets/quotedmessage.dart
@@ -54,6 +54,7 @@ class QuotedMessageBubbleState extends State<QuotedMessageBubble> {
       textWidthBasis: TextWidthBasis.longestLine,
     );
 
+
     var wdgQuote = FutureBuilder(
       future: widget.quotedMessage,
       builder: (context, snapshot) {
@@ -61,13 +62,14 @@ class QuotedMessageBubbleState extends State<QuotedMessageBubble> {
           try {
             var qMessage = (snapshot.data! as Message);
             // Swap the background color for quoted tweets..
+            var qTextColor = fromMe ? Provider.of<Settings>(context).theme.messageFromOtherTextColor() : Provider.of<Settings>(context).theme.messageFromMeTextColor();
             return Container(
                 margin: EdgeInsets.all(5),
                 padding: EdgeInsets.all(5),
                 color: fromMe ? Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor() : Provider.of<Settings>(context).theme.messageFromMeBackgroundColor(),
                 child: Wrap(runAlignment: WrapAlignment.spaceEvenly, alignment: WrapAlignment.spaceEvenly, runSpacing: 1.0, crossAxisAlignment: WrapCrossAlignment.center, children: [
-                  Center(widthFactor: 1, child: Padding(padding: EdgeInsets.all(10.0), child: Icon(Icons.reply, size: 32))),
-                  Center(widthFactor: 1.0, child: qMessage.getPreviewWidget(context))
+                  Center(widthFactor: 1, child: Padding(padding: EdgeInsets.all(10.0), child: Icon(Icons.reply, size: 32, color: qTextColor))),
+                  Center(widthFactor: 1.0, child: DefaultTextStyle( child: qMessage.getPreviewWidget(context), style: TextStyle( color: qTextColor)))
                 ]));
           } catch (e) {
             print(e);