diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index 5009cd2..16c6f07 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -257,7 +257,7 @@
                     </span>
 
                     <v-switch v-if="currentImageInput && currentImageInput.scaled" :label="$t('message.scale_image')"
-                      v-model="currentImageInput.useScaled" :disabled="currentImageInput.sendInfo" />
+                      v-model="currentImageInput.useScaled" :disabled="currentImageInput && currentImageInput.sendInfo !== undefined" />
                   </div>
                 </div>
               </v-card-text>
@@ -283,7 +283,7 @@
                 {{ $t("menu.cancel") }}
               </v-btn>
               <v-btn id="btn-attachment-send" color="primary" text @click="sendAttachment(undefined)"
-                v-if="currentSendShowSendButton" :disabled="sendingStatus != sendStatuses.INITIAL">{{ $t("menu.send") }}</v-btn>
+                v-if="currentSendShowSendButton" :disabled="currentSendShowSendButton && sendingStatus != sendStatuses.INITIAL">{{ $t("menu.send") }}</v-btn>
             </v-card-actions>
            </template>
         </v-card>
diff --git a/src/plugins/utils.js b/src/plugins/utils.js
index 03de79c..a4158c1 100644
--- a/src/plugins/utils.js
+++ b/src/plugins/utils.js
@@ -6,6 +6,7 @@ import { AutoDiscovery } from 'matrix-js-sdk';
 import User from '../models/user';
 const prettyBytes = require("pretty-bytes");
 import Hammer from "hammerjs";
+import { Thread } from 'matrix-js-sdk/lib/models/thread';
 
 export const STATE_EVENT_ROOM_DELETION_NOTICE = "im.keanu.room_deletion_notice";
 export const STATE_EVENT_ROOM_DELETED = "im.keanu.room_deleted";
@@ -399,7 +400,7 @@ class Util {
                 // If thread root (an eventId) is set, add that here
                 if (threadRoot) {
                     messageContent["m.relates_to"] = {
-                        "rel_type": "m.thread",
+                        "rel_type":  Thread.hasServerSideSupport ? "m.thread" : "io.element.thread",
                         "event_id": threadRoot
                     };
                 }