Continue refactor shakedown. Fix MAM
Continue refactor shakedown. Fix MAM

di-stars/kaiwa,lasombra/kaiwa,heyLu/kaiwa,nsg/kaiwa,warcode/kaiwa,birkb/kaiwa,weiss/kaiwa,lasombra/kaiwa,ForNeVeR/kaiwa,weiss/kaiwa,weiss/kaiwa,syci/kaiwa,digicoop/kaiwa,rogervaas/otalk-im-client,syci/kaiwa,nsg/kaiwa,birkb/kaiwa,digicoop/kaiwa,syci/kaiwa,warcode/kaiwa,heyLu/kaiwa,heyLu/kaiwa,di-stars/kaiwa,birkb/kaiwa,digicoop/kaiwa,otalk/otalk-im-client,unam3/kaiwa,unam3/kaiwa,lasombra/kaiwa,ForNeVeR/kaiwa,ForNeVeR/kaiwa,nsg/kaiwa,ForNeVeR/kaiwa,di-stars/kaiwa,warcode/kaiwa,otalk/otalk-im-client,rogervaas/otalk-im-client