diff --git a/Classes/LinphoneUI/UICamSwitch.h b/Classes/LinphoneUI/UICamSwitch.h
index bcde2513c..ea58049a6 100644
--- a/Classes/LinphoneUI/UICamSwitch.h
+++ b/Classes/LinphoneUI/UICamSwitch.h
@@ -20,9 +20,8 @@
 #import <UIKit/UIKit.h>
 
 
-@interface UICamSwitch : UIButton {
-@private
+@interface UICamSwitch : UIButton
+
+@property (nonatomic, assign) IBOutlet UIView* preview;
 
-}
-@property (nonatomic, retain) IBOutlet UIView* preview;
 @end
diff --git a/Classes/LinphoneUI/UICamSwitch.m b/Classes/LinphoneUI/UICamSwitch.m
index a3709596f..a97f143ba 100644
--- a/Classes/LinphoneUI/UICamSwitch.m
+++ b/Classes/LinphoneUI/UICamSwitch.m
@@ -54,15 +54,8 @@
 		[self initUICamSwitch];
 	}
     return self;
-}	
-
-
-- (void)dealloc {
-    [super dealloc];
-	[preview release];
 }
 
-
 #pragma mark - 
 
 -(void) touchUp:(id) sender {
diff --git a/Classes/LinphoneUI/UIEraseButton.h b/Classes/LinphoneUI/UIEraseButton.h
index 7baced2e6..795df2a60 100644
--- a/Classes/LinphoneUI/UIEraseButton.h
+++ b/Classes/LinphoneUI/UIEraseButton.h
@@ -24,6 +24,6 @@
 @interface UIEraseButton : UILongTouchButton<UILongTouchButtonDelegate>  {  
 }
 
-@property (nonatomic, retain) IBOutlet UITextField* addressField;
+@property (nonatomic, assign) IBOutlet UITextField* addressField;
 
 @end
diff --git a/Classes/LinphoneUI/UIEraseButton.m b/Classes/LinphoneUI/UIEraseButton.m
index d271a2727..0df88fae5 100644
--- a/Classes/LinphoneUI/UIEraseButton.m
+++ b/Classes/LinphoneUI/UIEraseButton.m
@@ -56,8 +56,8 @@
 }	
 
 - (void)dealloc {
+	addressField = nil;
     [super dealloc];
-	[addressField release];
 }