FetchBodyPart doesn't need the parent body structure

2 files changed, 15 insertions, 16 deletions

diff --git a/commands/msgview/open.go b/commands/msgview/open.go
index 44584f9..f708b2d 100644
--- a/commands/msgview/open.go
+++ b/commands/msgview/open.go
@@ -36,7 +36,7 @@ func (Open) Execute(aerc *widgets.Aerc, args []string) error {
 	p := mv.SelectedMessagePart()
 
 	store := mv.Store()
-	store.FetchBodyPart(p.Msg.Uid, p.Msg.BodyStructure, p.Index, func(reader io.Reader) {
+	store.FetchBodyPart(p.Msg.Uid, p.Index, func(reader io.Reader) {
 		extension := ""
 		// try to determine the correct extension based on mimetype
 		if part, err := p.Msg.BodyStructure.PartAtIndex(p.Index); err == nil {
diff --git a/commands/msgview/save.go b/commands/msgview/save.go
index f3cbb70..ef6bba8 100644
--- a/commands/msgview/save.go
+++ b/commands/msgview/save.go
@@ -109,21 +109,20 @@ func (Save) Execute(aerc *widgets.Aerc, args []string) error {
 
 	ch := make(chan error, 1)
 	store := mv.Store()
-	store.FetchBodyPart(
-		pi.Msg.Uid, pi.Msg.BodyStructure, pi.Index, func(reader io.Reader) {
-			f, err := os.Create(path)
-			if err != nil {
-				ch <- err
-				return
-			}
-			defer f.Close()
-			_, err = io.Copy(f, reader)
-			if err != nil {
-				ch <- err
-				return
-			}
-			ch <- nil
-		})
+	store.FetchBodyPart(pi.Msg.Uid, pi.Index, func(reader io.Reader) {
+		f, err := os.Create(path)
+		if err != nil {
+			ch <- err
+			return
+		}
+		defer f.Close()
+		_, err = io.Copy(f, reader)
+		if err != nil {
+			ch <- err
+			return
+		}
+		ch <- nil
+	})
 
 	// we need to wait for the callback prior to displaying a result
 	go func() {