Merge branch 'master' into code-cleanup

const.go

@@ -7,6 +7,7 @@ package main
 const (
 	VERSION          = "0.4.0-devel"
 	nsEme            = "urn:xmpp:eme:0"
+	nsHints          = "urn:xmpp:hints"
 	nsHttpUpload     = "urn:xmpp:http:upload:0"
 	nsJabberClient   = "jabber:client"
 	nsJabberData     = "jabber:x:data"

iqstructs.go

@@ -12,6 +12,10 @@ type OxMessageElement struct {
 	Text    string   `xml:",chardata"`
 	To      string   `xml:"to,attr"`
 	Id      string   `xml:"id,attr"`
+	Store   struct {
+		Text  string `xml:",chardata"`
+		Xmlns string `xml:"xmlns,attr"`
+	} `xml:"store"`
 	Openpgp struct {
 		Text  string `xml:",chardata"`
 		Xmlns string `xml:"xmlns,attr"`

ox.go

@@ -511,6 +511,7 @@ func oxEncrypt(client *xmpp.Client, oxPrivKey *crypto.Key, recipient string,
 	}
 	oxMessage.To = recipient
 	oxMessage.Id = getID()
+	oxMessage.Store.Xmlns = nsHints
 	oxMessage.Openpgp.Text = base64.StdEncoding.EncodeToString(pgpMessage.Data)
 	oxMessage.Openpgp.Xmlns = nsOx
 	oxMessage.Encryption.Xmlns = nsEme