Fix image sizing

.gitignore

@@ -7,6 +7,6 @@ harbour-matrix.pro.user
 *.autosave
 RPMS
 documentation.list
-*.swp
+*.sw*
 /.gdb_history
 /sysroot-dir/

qml/pages/delegates/ImageMessage.qml

@@ -8,7 +8,7 @@ ColumnLayout {
     Item {
         id: imageContainer
 
-        width: Math.min(bubble.fullMessageWidth, image.sourceSize.width)
+        width: Math.min(bubble.fullMessageWidth, model.Width > 100 ? model.Width : bubble.fullMessageWidth)
         height: width * model.ProportionalHeight
 
         Image {
@@ -34,12 +34,14 @@ ColumnLayout {
     Text {
         id: body
 
-        text: modelData.FormattedBody
-        visible: modelData.FormattedBody
+        text: modelData.Body
+        visible: modelData.Body
         color: Theme.secondaryColor
         wrapMode: Text.Wrap
         width: imageContainer.width
         font.pixelSize: Theme.fontSizeTiny
+        horizontalAlignment: model.IsSender ? Text.AlignRight : Text.AlignLeft
+        Layout.alignment: model.IsSender ? Qt.AlignRight : Qt.AlignLeft
     }
 
 }