Merge branch '4DA-master'
bug: fix file receiving

also write recieved file size in msg-history
Merge branch '4DA-recv-fix'