diff --git a/FurnitureAssembly/FurnitureAssemFileImplement/DataFileSingleton.cs b/FurnitureAssembly/FurnitureAssemFileImplement/DataFileSingleton.cs
index 51bcebb..e62e3da 100644
--- a/FurnitureAssembly/FurnitureAssemFileImplement/DataFileSingleton.cs
+++ b/FurnitureAssembly/FurnitureAssemFileImplement/DataFileSingleton.cs
@@ -16,11 +16,13 @@ namespace FurnitureAssemFileImplement
         private readonly string FurnitureFileName = "Furniture.xml";
         private readonly string ClientFileName = "Client.xml";
         private readonly string ImplementerFileName = "Implementer.xml";
+        private readonly string MessageFileName = "Message.xml";
         public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Furniture> Furnitures { get; private set; }
         public List<Client> Clients { get; private set; }
         public List<Implementer> Implementers { get; private set; }
+        public List<MessageInfo> Messages { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -34,6 +36,7 @@ namespace FurnitureAssemFileImplement
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
         public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement);
         public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement);
+        public void SaveMessages() => SaveData(Messages, MessageFileName, "Messages", x => x.GetXElement);
         private DataFileSingleton()
         {
             Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
@@ -41,6 +44,7 @@ namespace FurnitureAssemFileImplement
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
             Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
             Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!;
+            Messages = LoadData(MessageFileName, "Message", x => MessageInfo.Create(x)!)!;
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName,
        Func<XElement, T> selectFunction)
diff --git a/FurnitureAssembly/FurnitureAssemFileImplement/Implements/MessageInfoStorage.cs b/FurnitureAssembly/FurnitureAssemFileImplement/Implements/MessageInfoStorage.cs
new file mode 100644
index 0000000..5e9f730
--- /dev/null
+++ b/FurnitureAssembly/FurnitureAssemFileImplement/Implements/MessageInfoStorage.cs
@@ -0,0 +1,57 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.SearchModels;
+using FurnitureAssemblyContracts.StoragesContracts;
+using FurnitureAssemblyContracts.ViewModels;
+using FurnitureAssemFileImplement.Models;
+
+namespace FurnitureAssemFileImplement.Implements
+{
+    public class MessageInfoStorage : IMessageInfoStorage
+    {
+        private readonly DataFileSingleton _source;
+        public MessageInfoStorage()
+        {
+            _source = DataFileSingleton.GetInstance();
+        }
+        public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
+        {
+            if (model.MessageId == null)
+            {
+                return null;
+            }
+            return _source.Messages.FirstOrDefault(x => x.MessageId.Equals(model.MessageId))?.GetViewModel;
+        }
+
+        public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
+        {
+            if (!model.ClientId.HasValue)
+            {
+                return new();
+            }
+            return _source.Messages
+            .Where(x => x.ClientId.Equals(model.ClientId))
+           .Select(x => x.GetViewModel)
+           .ToList();
+        }
+
+        public List<MessageInfoViewModel> GetFullList()
+        {
+            return _source.Messages
+            .Select(x => x.GetViewModel)
+           .ToList();
+        }
+
+        public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
+        {
+           
+            var newClient = MessageInfo.Create(model);
+            if (newClient == null)
+            {
+                return null;
+            }
+            _source.Messages.Add(newClient);
+            _source.SaveMessages();
+            return newClient.GetViewModel;
+        }
+    }
+}
diff --git a/FurnitureAssembly/FurnitureAssemFileImplement/Models/MessageInfo.cs b/FurnitureAssembly/FurnitureAssemFileImplement/Models/MessageInfo.cs
new file mode 100644
index 0000000..f051bf3
--- /dev/null
+++ b/FurnitureAssembly/FurnitureAssemFileImplement/Models/MessageInfo.cs
@@ -0,0 +1,75 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.ViewModels;
+using FurnitureAssemblyDataModels.Models;
+using System.Xml.Linq;
+
+namespace FurnitureAssemFileImplement.Models
+{
+    public class MessageInfo : IMessageInfoModel
+    {
+        public string MessageId { get; private set; } = string.Empty;
+
+        public int? ClientId { get; private set; }
+
+        public string SenderName { get; private set; } = string.Empty;
+
+        public DateTime DateDelivery { get; private set; } = DateTime.Now;
+
+        public string Subject { get; private set; } = string.Empty;
+
+        public string Body { get; private set; } = string.Empty;
+
+        public static MessageInfo? Create(MessageInfoBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new()
+            {
+                MessageId = model.MessageId,
+                ClientId = model.ClientId,
+                Body = model.Body,
+                Subject = model.Subject,
+                SenderName = model.SenderName,
+                DateDelivery = model.DateDelivery,
+            };
+        }
+
+        public static MessageInfo? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new MessageInfo()
+            {
+                MessageId = element.Element("MessageId")!.Value,
+                ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value),
+                Body = element.Element("Body")!.Value,
+                Subject = element.Element("Subject")!.Value,
+                SenderName = element.Element("SenderName")!.Value,
+                DateDelivery = DateTime.ParseExact(element.Element("DateDelivery")!.Value, "G", null)
+            };
+        }
+
+        public MessageInfoViewModel GetViewModel => new()
+        {
+            Body = Body,
+            Subject = Subject,
+            ClientId = ClientId,
+            MessageId = MessageId,
+            SenderName = SenderName,
+            DateDelivery = DateDelivery,
+        };
+
+        public XElement GetXElement => new("MessageInfo",
+            new XElement("SenderName", SenderName),
+            new XElement("ClientId", ClientId),
+            new XElement("DateDelivery", DateDelivery),
+            new XAttribute("MessageId", MessageId),
+            new XElement("Body", Body),
+            new XElement("Subject", Subject)      
+       );
+    }
+}
diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs
index 3a929d9..2a7cfbf 100644
--- a/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs
+++ b/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs
@@ -15,6 +15,7 @@ namespace FurnitureAssemblyListImplement
         public List<Furniture> Furnitures { get; set; }
         public List<Client> Clients { get; set; }
         public List<Implementer> Implementers { get; set; }
+        public List<MessageInfo> Messages { get; set; }
         private DataListSingleton()
         {
             Components = new List<Component>();
@@ -22,6 +23,7 @@ namespace FurnitureAssemblyListImplement
             Furnitures = new List<Furniture>();
             Clients = new List<Client>();
             Implementers = new List<Implementer>();
+            Messages = new List<MessageInfo>();
         }
         public static DataListSingleton GetInstance()
         {
diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/MessageInfoStorage.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/MessageInfoStorage.cs
new file mode 100644
index 0000000..d2db11d
--- /dev/null
+++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/MessageInfoStorage.cs
@@ -0,0 +1,68 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.SearchModels;
+using FurnitureAssemblyContracts.StoragesContracts;
+using FurnitureAssemblyContracts.ViewModels;
+using FurnitureAssemblyListImplement.Models;
+
+namespace FurnitureAssemblyListImplement.Implements
+{
+    public class MessageInfoStorage : IMessageInfoStorage
+    {
+        private readonly DataListSingleton _source;
+
+        public MessageInfoStorage()
+        {
+            _source = DataListSingleton.GetInstance();
+        }
+
+        public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
+        {
+            foreach (var message in _source.Messages)
+            {
+                if (model.MessageId != null && message.MessageId.Equals(model.MessageId))
+                {
+                    return message.GetViewModel;
+                }        
+            }
+            return null;
+        }
+
+        public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
+        {
+            var result = new List<MessageInfoViewModel>();
+            if (!model.ClientId.HasValue)
+            {
+                return result;
+            }
+            foreach (var message in _source.Messages)
+            {
+                if (message.ClientId.Equals(model.ClientId))
+                {
+                    result.Add(message.GetViewModel);
+                }
+            }
+            return result;
+        }
+
+        public List<MessageInfoViewModel> GetFullList()
+        {
+            var result = new List<MessageInfoViewModel>();
+            foreach (var message in _source.Messages)
+            {
+                result.Add(message.GetViewModel);
+            }
+            return result;
+        }
+
+        public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
+        {           
+            var newMessage = MessageInfo.Create(model);
+            if (newMessage == null)
+            {
+                return null;
+            }
+            _source.Messages.Add(newMessage);
+            return newMessage.GetViewModel;
+        }
+    }
+}
diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Models/MessageInfo.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Models/MessageInfo.cs
new file mode 100644
index 0000000..332bb9f
--- /dev/null
+++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Models/MessageInfo.cs
@@ -0,0 +1,48 @@
+using FurnitureAssemblyContracts.BindingModels;
+using FurnitureAssemblyContracts.ViewModels;
+using FurnitureAssemblyDataModels.Models;
+
+namespace FurnitureAssemblyListImplement.Models
+{
+    public class MessageInfo : IMessageInfoModel
+    {
+        public string MessageId { get; private set; } = string.Empty;
+
+        public int? ClientId { get; private set; } 
+
+        public string SenderName { get; private set; } = string.Empty;
+
+        public DateTime DateDelivery { get; private set; } = DateTime.Now;
+
+        public string Subject { get; private set; } = string.Empty;
+
+        public string Body { get; private set; } = string.Empty;
+
+        public static MessageInfo? Create(MessageInfoBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new()
+            {
+                MessageId = model.MessageId,
+                ClientId = model.ClientId,
+                Body = model.Body,
+                Subject = model.Subject,                              
+                SenderName = model.SenderName,
+                DateDelivery = model.DateDelivery,
+            };
+        }
+
+        public MessageInfoViewModel GetViewModel => new()
+        {
+            Body = Body,
+            Subject = Subject,
+            ClientId = ClientId,
+            MessageId = MessageId,
+            SenderName = SenderName,
+            DateDelivery = DateDelivery,
+        };
+    }
+}