diff --git a/src/add-ons/tracker/zipomatic/ZipOMatic.cpp b/src/add-ons/tracker/zipomatic/ZipOMatic.cpp
index cb0ad99845..b2cc3e662e 100644
--- a/src/add-ons/tracker/zipomatic/ZipOMatic.cpp
+++ b/src/add-ons/tracker/zipomatic/ZipOMatic.cpp
@@ -17,6 +17,7 @@
 #include "ZipOMaticWindow.h"
 
 
+#undef B_TRANSLATE_CONTEXT
 #define B_TRANSLATE_CONTEXT "file:ZipOMatic.cpp"
 
 
@@ -84,13 +85,14 @@ ZipOMatic::MessageReceived(BMessage* message)
 		case ZIPPO_QUIT_OR_CONTINUE:
 		{
 			int32 button;
-			if (message->FindInt32("which", &button) == B_OK)
+			if (message->FindInt32("which", &button) == B_OK) {
 				if (button == 0) {
 					_StopZipping();
 				} else {
 					if (CountWindows() == 0)
 						Quit();
 				}
+			}
 			break;
 		}
 
diff --git a/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp b/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp
index 245afa67d9..66a16ac77b 100644
--- a/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp
+++ b/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp
@@ -33,6 +33,7 @@
 #include "ZipperThread.h"
 
 
+#undef B_TRANSLATE_CONTEXT
 #define B_TRANSLATE_CONTEXT "file:ZipOMaticWindow.cpp"
 
 
diff --git a/src/add-ons/tracker/zipomatic/ZipperThread.cpp b/src/add-ons/tracker/zipomatic/ZipperThread.cpp
index b745f65a13..71ae619a9e 100644
--- a/src/add-ons/tracker/zipomatic/ZipperThread.cpp
+++ b/src/add-ons/tracker/zipomatic/ZipperThread.cpp
@@ -27,6 +27,7 @@
 #include "ZipOMaticWindow.h"
 
 
+#undef B_TRANSLATE_CONTEXT
 #define B_TRANSLATE_CONTEXT "file:ZipperThread.cpp"