diff --git a/protonmail/adresses.go b/protonmail/adresses.go
index 8e18a05..67bf797 100644
--- a/protonmail/adresses.go
+++ b/protonmail/adresses.go
@@ -35,7 +35,7 @@ type Address struct {
 	Receive     int
 	Status      AddressStatus
 	Type        AddressType
-	Order       int
+	Order       int64
 	DisplayName string
 	Signature   string // HTML
 	HasKeys     int
diff --git a/protonmail/messages.go b/protonmail/messages.go
index 3563bbd..8e3b214 100644
--- a/protonmail/messages.go
+++ b/protonmail/messages.go
@@ -491,6 +491,19 @@ func (set *MessagePackageSet) Encrypt(mimeType string, signed *openpgp.Entity) (
 	}, nil
 }
 
+func cipherFunctionString(cipherFunc packet.CipherFunction) string {
+	switch cipherFunc {
+	case packet.CipherAES128:
+		return "aes128"
+	case packet.CipherAES192:
+		return "aes192"
+	case packet.CipherAES256:
+		return "aes256"
+	default:
+		panic("protonmail: unsupported cipher function")
+	}
+}
+
 func (set *MessagePackageSet) AddCleartext(addr string) (*MessagePackage, error) {
 	pkg := &MessagePackage{
 		Type:      MessagePackageCleartext,
@@ -501,7 +514,7 @@ func (set *MessagePackageSet) AddCleartext(addr string) (*MessagePackage, error)
 
 	if set.BodyKey == nil || set.AttachmentKeys == nil {
 		set.BodyKey = &MessageBodyKey{
-			Algorithm: "aes256",
+			Algorithm: cipherFunctionString(set.bodyKey.CipherFunc),
 			Key:       base64.StdEncoding.EncodeToString(set.bodyKey.Key),
 		}