diff --git a/model/lib/extensions/session_extension.dart b/model/lib/extensions/session_extension.dart
index 2659ceeb3..12be0acac 100644
--- a/model/lib/extensions/session_extension.dart
+++ b/model/lib/extensions/session_extension.dart
@@ -1,15 +1,19 @@
 
+import 'package:core/utils/app_logger.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
 import 'package:uri/uri.dart';
 
 extension SessionExtension on Session {
   String getDownloadUrl() {
-    var baseUrl = '${downloadUrl.origin}${downloadUrl.path}';
+    var baseUrl = '${downloadUrl.origin}${downloadUrl.path}?${downloadUrl.query}';
     if (baseUrl.endsWith('/')) {
       baseUrl = baseUrl.substring(0, baseUrl.length - 1);
     }
-    return Uri.decodeFull(baseUrl);
+    log('SessionExtension::getDownloadUrl(): $baseUrl');
+    final downloadUrlDecode = Uri.decodeFull(baseUrl);
+    log('SessionExtension::getDownloadUrl(): DECODE $downloadUrlDecode');
+    return downloadUrlDecode;
   }
 
   Uri getUploadUrl(AccountId accountId) {