diff --git a/src/udi/dispatcher/dispatcher.go b/src/udi/dispatcher/dispatcher.go
index 229621b..adcc76e 100644
--- a/src/udi/dispatcher/dispatcher.go
+++ b/src/udi/dispatcher/dispatcher.go
@@ -5,7 +5,6 @@ import "time"
 import "os"
 import "fmt"
 import "net/url"
-import "encoding/json"
 import "udi/mqtt"
 import "udi/config"
 import "udi/handlers/handler"
@@ -39,24 +38,20 @@ func InitDispatcher() {
   }
 }
 
-func storeMessage(filename, item string) {
-  file, err := os.OpenFile(archivingFilename, os.O_APPEND | os.O_CREATE | os.O_WRONLY, 0644)
+func storeMessage(filename string, item archivingStruct) {
+  file, err := os.OpenFile(filename, os.O_APPEND | os.O_CREATE | os.O_WRONLY, 0644)
   if err != nil {
-    log.Printf("Unable to open archiving file %s, message is not archived: %s", archivingFilename, err)
+    log.Printf("Unable to open archiving file %s, message is not archived: %s", filename, err)
     return
   }
   defer file.Close()
-  archivingString, err := json.Marshal(archivingItem)
-  if err != nil {
-    log.Printf("Unable to convert to json, message is not archived: %s", err)
-    return
-  }
-  _, err := file.WriteString(string(message.Payload))
+  archivingString := fmt.Sprintf("%s - %s - %s\n", item.timestamp, item.topic, item.payload)
+  _, err = file.WriteString(string(archivingString) + "\n")
   if err != nil {
     log.Printf("Unable to write message, message is not archived: %s", err)
     return
   }
-  log.Printf("Archiving message in file %s", archivingFilename)
+  log.Printf("Archiving message in file %s", filename)
 }
 
 func archiver() {