diff --git a/client/helpers/backgroundHelper.go b/client/helpers/backgroundHelper.go
index 67864c6..9e87b6a 100644
--- a/client/helpers/backgroundHelper.go
+++ b/client/helpers/backgroundHelper.go
@@ -26,8 +26,8 @@ type ReceivedMessage struct {
 	Location      meowlib.Location
 }
 
-// CheckForMessages checks for messages on a single server
-func CheckForMessages(storage_path string, job *client.RequestsJob, timeout int, longPoll bool) (int, string, error) {
+// PollServer checks for messages on a single server
+func PollServer(storage_path string, job *client.RequestsJob, timeout int, longPoll bool) (int, string, error) {
 
 	count := 0
 
@@ -111,8 +111,8 @@ func SaveCheckJobs() (string, error) {
 	return "", nil
 }
 
-// ReadMessage
-func ReadMessage(messageFilename string) ([]string, []string, string, error) {
+// ConsumeInboxFile
+func ConsumeInboxFile(messageFilename string) ([]string, []string, string, error) {
 
 	messagesOverview := []string{}
 	filenames := []string{}
@@ -150,7 +150,7 @@ func ReadMessage(messageFilename string) ([]string, []string, string, error) {
 			//fmt.Println("From:", usermsg.From)
 			//jsonUserMessage, _ := json.Marshal(usermsg)
 			//fmt.Println(string(jsonUserMessage))
-			peer = client.GetConfig().GetIdentity().Peers.GetFromPublicKey(usermsg.From)
+			//peer = client.GetConfig().GetIdentity().Peers.GetFromPublicKey(usermsg.From)
 
 			// detach files
 			if usermsg.Files != nil {
@@ -177,6 +177,8 @@ func ReadMessage(messageFilename string) ([]string, []string, string, error) {
 			if err != nil {
 				return nil, nil, "ReadMessage: StoreMessage", err
 			}
+			filenames = []string{}
+
 		}
 	}
 
@@ -189,8 +191,8 @@ func ReadMessage(messageFilename string) ([]string, []string, string, error) {
 	return messagesOverview, filenames, "", nil
 }
 
-// CheckForMessages checks for messages on a single server
-func LongPollForMessages(storage_path string, jobs []client.RequestsJob, timeout int, longPoll bool) (int, string, error) {
+// LongPollAllSerevrJobs checks for messages on a all servers defived in job file
+func LongPollAllSerevrJobs(storage_path string, jobs []client.RequestsJob, timeout int, longPoll bool) (int, string, error) {
 
 	// Channel to collect results
 	resultChan := make(chan int, len(jobs))
@@ -207,7 +209,7 @@ func LongPollForMessages(storage_path string, jobs []client.RequestsJob, timeout
 			defer wg.Done()
 
 			// Long-polling call to the server
-			cnt, _, err := CheckForMessages(storage_path, &job, timeout, true)
+			cnt, _, err := PollServer(storage_path, &job, timeout, true)
 
 			if err == nil && cnt > 0 {
 				select {
diff --git a/client/helpers/call.go b/client/helpers/call.go
index c547251..7dd442c 100644
--- a/client/helpers/call.go
+++ b/client/helpers/call.go
@@ -47,7 +47,7 @@ func BuildCallMessage(videodata *meowlib.VideoData, srvuid string, peer_uid stri
 
 	usermessage.Status.AnswerToUuid = replyToUid
 
-	return messageBuildPostprocess(usermessage, srvuid, peer)
+	return messageBuildPackAndStore(usermessage, srvuid, peer)
 }
 
 func BuildCancelCallMessage() {
diff --git a/client/helpers/messageHelper.go b/client/helpers/messageHelper.go
index 02c54bf..84c19e9 100644
--- a/client/helpers/messageHelper.go
+++ b/client/helpers/messageHelper.go
@@ -5,7 +5,7 @@ import (
 	"forge.redroom.link/yves/meowlib/client"
 )
 
-func messageBuildPostprocess(msg *meowlib.UserMessage, srvuid string, peer *client.Peer) ([]byte, string, error) {
+func messageBuildPackAndStore(msg *meowlib.UserMessage, srvuid string, peer *client.Peer) ([]byte, string, error) {
 	// Get the message server
 	srv, err := client.GetConfig().GetIdentity().MessageServers.LoadServer(srvuid)
 	if err != nil {
@@ -30,7 +30,7 @@ func messageBuildPostprocess(msg *meowlib.UserMessage, srvuid string, peer *clie
 	return data, "", nil
 }
 
-func PrepareUserMessage(message string, srvuid string, peer_uid string, replyToUid string, filelist []string) ([]byte, string, error) {
+func CreateUserMessage(message string, srvuid string, peer_uid string, replyToUid string, filelist []string) ([]byte, string, error) {
 
 	peer := client.GetConfig().GetIdentity().Peers.GetFromUid(peer_uid)
 
@@ -47,7 +47,7 @@ func PrepareUserMessage(message string, srvuid string, peer_uid string, replyToU
 	}
 	usermessage.Status.AnswerToUuid = replyToUid
 
-	return messageBuildPostprocess(usermessage, srvuid, peer)
+	return messageBuildPackAndStore(usermessage, srvuid, peer)
 
 }
 
diff --git a/client/messagestorage.go b/client/messagestorage.go
index 1b12a75..d9184cb 100644
--- a/client/messagestorage.go
+++ b/client/messagestorage.go
@@ -29,7 +29,6 @@ func StoreMessage(peer *Peer, usermessage *meowlib.UserMessage, filenames []stri
 			return err
 		}
 		file.Close()
-		peer.DbIds = append(peer.DbIds, dbid)
 		sqliteDatabase, err := sql.Open("sqlite3", filepath.Join(cfg.StoragePath, identity.Uuid, dbid+GetConfig().DbSuffix))
 		if err != nil {
 			return err