diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs
index 4f7ca152..70ff0a95 100644
--- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs
+++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/MessageWizardModel.cs
@@ -51,9 +51,9 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
                 ContextId = message.ContextId,
                 Subject = message.Subject,
                 Text = message.Content,
-                SenderEmailAddress = message.SenderEmailAddress,
+                EmailAddress = message.SenderEmailAddress,
                 Recipients = new List<EmailRecipient> { new EmailRecipient(
-                    Guid.NewGuid(), message.ReceiverId, id) }            
+                    Guid.NewGuid(), message.ReceiverId, id, "recipient@aycode.com") }            
             };
         }
     }    
diff --git a/TIAMWebApp/Shared/Services/ImageDataService.cs b/TIAMWebApp/Shared/Services/ImageDataService.cs
index e344db87..35b06201 100644
--- a/TIAMWebApp/Shared/Services/ImageDataService.cs
+++ b/TIAMWebApp/Shared/Services/ImageDataService.cs
@@ -10,7 +10,7 @@ using System.Net.Http.Headers;
 using System.Net.Http.Json;
 using System.Text;
 using System.Threading.Tasks;
-using TIAM.Entities.TransferDestinations;
+//using TIAM.Entities.TransferDestinations;
 using TIAMWebApp.Shared.Application.Interfaces;
 using TIAMWebApp.Shared.Application.Models.ClientSide;
 using TIAMWebApp.Shared.Application.Models;