diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29fe069..e2b062d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Flag commands [#334]
+
 ## [0.5.9] - 2022-03-12
 
 ### Added
@@ -506,5 +510,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#324]: https://github.com/soywod/himalaya/issues/324
 [#329]: https://github.com/soywod/himalaya/issues/329
 [#331]: https://github.com/soywod/himalaya/issues/331
+[#334]: https://github.com/soywod/himalaya/issues/334
 [#335]: https://github.com/soywod/himalaya/issues/335
 [#338]: https://github.com/soywod/himalaya/issues/338
diff --git a/src/main.rs b/src/main.rs
index 61c647d..66f3900 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -288,14 +288,14 @@ fn main() -> Result<()> {
             );
         }
         Some(msg_args::Cmd::Flag(m)) => match m {
-            Some(flag_args::Cmd::Set(seq_range, flags)) => {
-                return flag_handlers::set(seq_range, mbox, &flags, &mut printer, backend);
+            Some(flag_args::Cmd::Set(seq_range, ref flags)) => {
+                return flag_handlers::set(seq_range, flags, mbox, &mut printer, backend);
             }
-            Some(flag_args::Cmd::Add(seq_range, flags)) => {
-                return flag_handlers::add(seq_range, mbox, &flags, &mut printer, backend);
+            Some(flag_args::Cmd::Add(seq_range, ref flags)) => {
+                return flag_handlers::add(seq_range, flags, mbox, &mut printer, backend);
             }
-            Some(flag_args::Cmd::Remove(seq_range, flags)) => {
-                return flag_handlers::remove(seq_range, mbox, &flags, &mut printer, backend);
+            Some(flag_args::Cmd::Remove(seq_range, ref flags)) => {
+                return flag_handlers::remove(seq_range, flags, mbox, &mut printer, backend);
             }
             _ => (),
         },