diff --git a/lib/views/messageview.dart b/lib/views/messageview.dart
index 8ee6196c..91e576ac 100644
--- a/lib/views/messageview.dart
+++ b/lib/views/messageview.dart
@@ -105,6 +105,10 @@ class _MessageViewState extends State<MessageView> {
               //IconButton(icon: Icon(Icons.chat), onPressed: _pushContactSettings),
               //IconButton(icon: Icon(Icons.list), onPressed: _pushContactSettings),
               //IconButton(icon: Icon(Icons.push_pin), onPressed: _pushContactSettings),
+              IconButton(
+                icon: Icon(CwtchIcons.send_invite, size: 24),
+                tooltip: AppLocalizations.of(context)!.sendInvite,
+                onPressed: (){_modalSendInvitation(context);}),
               IconButton(
                   icon: Provider.of<ContactInfoState>(context, listen: false).isGroup == true ? Icon(CwtchIcons.group_settings_24px) : Icon(CwtchIcons.peer_settings_24px),
                   tooltip: AppLocalizations.of(context)!.conversationSettings,
@@ -205,38 +209,31 @@ class _MessageViewState extends State<MessageView> {
                 child: RawKeyboardListener(
                     focusNode: FocusNode(),
                     onKey: handleKeyPress,
-                    child: TextFormField(
-                        key: Key('txtCompose'),
-                        controller: ctrlrCompose,
-                        focusNode: focusNode,
-                        autofocus: !Platform.isAndroid,
-                        textInputAction: TextInputAction.newline,
-                        keyboardType: TextInputType.multiline,
-                        enableIMEPersonalizedLearning: false,
-                        minLines: 1,
-                        maxLines: null,
-                        onFieldSubmitted: _sendMessage,
-                        enabled: !isOffline,
-                        decoration: InputDecoration(
-                          hintText: isOffline ? "" : AppLocalizations.of(context)!.placeholderEnterMessage,
-                          hintStyle: TextStyle(color: Provider.of<Settings>(context).theme.altTextColor()),
-                          enabledBorder: InputBorder.none,
-                          focusedBorder: InputBorder.none,
-                          enabled: true,
-                          prefixIcon: IconButton(
-                              icon: Icon(CwtchIcons.send_invite, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()),
-                              tooltip: AppLocalizations.of(context)!.sendInvite,
-                              enableFeedback: true,
-                              splashColor: Provider.of<Settings>(context).theme.defaultButtonActiveColor(),
-                              hoverColor: Provider.of<Settings>(context).theme.defaultButtonActiveColor(),
-                              onPressed: () => _modalSendInvitation(context)),
-                          suffixIcon: IconButton(
-                            icon: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()),
-                            tooltip: AppLocalizations.of(context)!.sendMessage,
-                            onPressed: isOffline ? null : _sendMessage,
-                          ),
-                        )))),
-          ),
+                    child: Padding(
+                      padding: EdgeInsets.all(8), child:TextFormField(
+                          key: Key('txtCompose'),
+                          controller: ctrlrCompose,
+                          focusNode: focusNode,
+                          autofocus: !Platform.isAndroid,
+                          textInputAction: TextInputAction.newline,
+                          keyboardType: TextInputType.multiline,
+                          enableIMEPersonalizedLearning: false,
+                          minLines: 1,
+                          maxLines: null,
+                          onFieldSubmitted: _sendMessage,
+                          enabled: !isOffline,
+                          decoration: InputDecoration(
+                            hintText: isOffline ? "" : AppLocalizations.of(context)!.placeholderEnterMessage,
+                            hintStyle: TextStyle(color: Provider.of<Settings>(context).theme.altTextColor()),
+                            enabledBorder: InputBorder.none,
+                            focusedBorder: InputBorder.none,
+                            enabled: true,
+                            suffixIcon: ElevatedButton(
+                                style: ElevatedButton.styleFrom(primary: Provider.of<Settings>(context).theme.defaultButtonColor()),
+                                child: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()),
+                                onPressed: isOffline ? null : _sendMessage,
+                            ))),
+                          )))),
         ],
       ),
     );