diff --git a/Classes/BuschJaegerCallView.h b/Classes/BuschJaegerCallView.h
index be6f94d7f..dced2f831 100644
--- a/Classes/BuschJaegerCallView.h
+++ b/Classes/BuschJaegerCallView.h
@@ -42,7 +42,9 @@
 @property (nonatomic, retain) IBOutlet UIToggleButton* microButton;
 @property (nonatomic, retain) IBOutlet UIDigitButton* lightsButton;
 @property (nonatomic, retain) IBOutlet UIDigitButton* openDoorButton;
+@property (nonatomic, retain) IBOutlet UIButton* snapshotButton;
 
 - (IBAction)takeCall:(id)sender;
+- (IBAction)onSnapshotClick:(id)sender;
 
 @end
diff --git a/Classes/BuschJaegerCallView.m b/Classes/BuschJaegerCallView.m
index fda296e72..d6c975e40 100644
--- a/Classes/BuschJaegerCallView.m
+++ b/Classes/BuschJaegerCallView.m
@@ -34,11 +34,7 @@
 @synthesize microButton;
 @synthesize lightsButton;
 @synthesize openDoorButton;
-
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-}
+@synthesize snapshotButton;
 
 
 #pragma mark - View lifecycle
@@ -51,6 +47,7 @@
     [microButton release];
     [lightsButton release];
     [openDoorButton release];
+    [snapshotButton release];
     
     // Remove all observer
     [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -58,11 +55,6 @@
     [super dealloc];
 }
 
-// 59x47
-// 54
-// 54 -> 67
-// 59 -> 73 x 58
-// 257
 - (void)viewDidLoad {
     [super viewDidLoad];
     
@@ -90,8 +82,8 @@
         [BuschJaegerUtils createGradientForView:takeCallButton withTopColor:col1 bottomColor:col2];
     }
     
-    linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)videoView);
-    linphone_core_set_native_preview_window_id([LinphoneManager getLc],0);
+    linphone_core_set_native_video_window_id([LinphoneManager getLc], (unsigned long)videoView);
+    linphone_core_set_native_preview_window_id([LinphoneManager getLc], 0);
     
     videoZoomHandler = [[VideoZoomHandler alloc] init];
     [videoZoomHandler setup:videoView];
@@ -227,7 +219,7 @@
     [declineButton setHidden:NO];
     [endOrRejectCallButton setHidden:YES];
     [videoView setHidden:NO];
-    
+    [snapshotButton setHidden:YES];
 
     NSString *contactName = NSLocalizedString(@"Unknown", nil);
     
@@ -259,6 +251,7 @@
     [declineButton setHidden:YES];
     [endOrRejectCallButton setHidden:NO];
     [videoView setHidden:NO];
+    [snapshotButton setHidden:YES];
 }
 
 - (void)displayVideoCall {
@@ -268,8 +261,18 @@
     [declineButton setHidden:YES];
     [endOrRejectCallButton setHidden:NO];
     [videoView setHidden:NO];
+    [snapshotButton setHidden:NO];
 }
 
+- (void)saveImage:(NSString*)imagePath {
+    UIImage *image = [UIImage imageWithContentsOfFile:imagePath];
+    if(image != nil) {
+        UIImageWriteToSavedPhotosAlbum(image, nil, nil, nil);
+    }
+}
+
+#pragma mark - Actions Functions
+
 - (IBAction)takeCall:(id)sender {
     const MSList* calls = linphone_core_get_calls([LinphoneManager getLc]);	
     
@@ -283,4 +286,15 @@
     }
 }
 
+- (IBAction)onSnapshotClick:(id)sender {
+    LinphoneCall *call = linphone_core_get_current_call([LinphoneManager getLc]);
+    if(call != NULL) {
+        NSString *imagePath = [NSTemporaryDirectory() stringByAppendingPathComponent: [NSString stringWithFormat: @"%.0f.%@", [NSDate timeIntervalSinceReferenceDate] * 1000.0, @"jpg"]];
+        int ret = linphone_call_take_video_snapshot(call, [imagePath UTF8String]);
+        if(ret == 0) {
+            [self performSelector:@selector(saveImage:) withObject:imagePath afterDelay:0.5];
+        }
+    }
+}
+
 @end
diff --git a/Classes/BuschJaegerCallView.xib b/Classes/BuschJaegerCallView.xib
index f9803d52d..4748ede46 100644
--- a/Classes/BuschJaegerCallView.xib
+++ b/Classes/BuschJaegerCallView.xib
@@ -50,6 +50,44 @@
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
+					<object class="IBUIButton" id="317702958">
+						<reference key="NSNextResponder" ref="191373211"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{266, 20}, {34, 34}}</string>
+						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="903884486"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<object class="NSColor" key="IBUIHighlightedTitleColor" id="684165454">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MQA</bytes>
+						</object>
+						<object class="NSColor" key="IBUINormalTitleColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+						</object>
+						<object class="NSColor" key="IBUINormalTitleShadowColor" id="628689408">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MC41AA</bytes>
+						</object>
+						<object class="NSCustomResource" key="IBUINormalImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">snapshot.png</string>
+						</object>
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="488695651">
+							<int key="type">2</int>
+							<double key="pointSize">15</double>
+						</object>
+						<object class="NSFont" key="IBUIFont" id="32089125">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">15</double>
+							<int key="NSfFlags">16</int>
+						</object>
+					</object>
 					<object class="IBUIView" id="903884486">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
@@ -70,27 +108,14 @@
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<int key="IBUIContentHorizontalAlignment">0</int>
 								<int key="IBUIContentVerticalAlignment">0</int>
-								<object class="NSColor" key="IBUIHighlightedTitleColor" id="684165454">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MQA</bytes>
-								</object>
-								<object class="NSColor" key="IBUINormalTitleShadowColor" id="628689408">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC41AA</bytes>
-								</object>
+								<reference key="IBUIHighlightedTitleColor" ref="684165454"/>
+								<reference key="IBUINormalTitleShadowColor" ref="628689408"/>
 								<object class="NSCustomResource" key="IBUINormalImage">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">bj_start_call.png</string>
 								</object>
-								<object class="IBUIFontDescription" key="IBUIFontDescription" id="488695651">
-									<int key="type">2</int>
-									<double key="pointSize">15</double>
-								</object>
-								<object class="NSFont" key="IBUIFont" id="145297720">
-									<string key="NSName">Helvetica-Bold</string>
-									<double key="NSSize">15</double>
-									<int key="NSfFlags">16</int>
-								</object>
+								<reference key="IBUIFontDescription" ref="488695651"/>
+								<reference key="IBUIFont" ref="32089125"/>
 							</object>
 							<object class="IBUIButton" id="842436331">
 								<reference key="NSNextResponder" ref="903884486"/>
@@ -112,7 +137,7 @@
 									<string key="NSResourceName">bj_end_call.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="488695651"/>
-								<reference key="IBUIFont" ref="145297720"/>
+								<reference key="IBUIFont" ref="32089125"/>
 							</object>
 							<object class="IBUIButton" id="889522260">
 								<reference key="NSNextResponder" ref="903884486"/>
@@ -139,7 +164,7 @@
 									<string key="NSResourceName">bj_mute_on.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="488695651"/>
-								<reference key="IBUIFont" ref="145297720"/>
+								<reference key="IBUIFont" ref="32089125"/>
 							</object>
 							<object class="IBUIButton" id="33985418">
 								<reference key="NSNextResponder" ref="903884486"/>
@@ -147,6 +172,7 @@
 								<string key="NSFrame">{{207, 0}, {73, 58}}</string>
 								<reference key="NSSuperview" ref="903884486"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:225</string>
 								<reference key="IBUIBackgroundColor" ref="666829842"/>
 								<bool key="IBUIOpaque">NO</bool>
@@ -161,7 +187,7 @@
 									<string key="NSResourceName">bj_decline.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="488695651"/>
-								<reference key="IBUIFont" ref="145297720"/>
+								<reference key="IBUIFont" ref="32089125"/>
 							</object>
 							<object class="IBUIButton" id="1031602630">
 								<reference key="NSNextResponder" ref="903884486"/>
@@ -188,7 +214,7 @@
 									<string key="NSResourceName">bj_door.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="488695651"/>
-								<reference key="IBUIFont" ref="145297720"/>
+								<reference key="IBUIFont" ref="32089125"/>
 							</object>
 							<object class="IBUIButton" id="762727327">
 								<reference key="NSNextResponder" ref="903884486"/>
@@ -220,13 +246,13 @@
 									<string key="NSResourceName">bj_light.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="488695651"/>
-								<reference key="IBUIFont" ref="145297720"/>
+								<reference key="IBUIFont" ref="32089125"/>
 							</object>
 						</array>
 						<string key="NSFrame">{{20, 399}, {280, 58}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
+						<reference key="NSNextKeyView" ref="910162139"/>
 						<string key="NSReuseIdentifierKey">_NS:196</string>
 						<reference key="IBUIBackgroundColor" ref="666829842"/>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -241,7 +267,7 @@
 								<string key="NSFrameSize">{320, 42}</string>
 								<reference key="NSSuperview" ref="935863454"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="903884486"/>
+								<reference key="NSNextKeyView" ref="317702958"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -374,6 +400,14 @@
 					</object>
 					<int key="connectionID">88</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">snapshotButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="317702958"/>
+					</object>
+					<int key="connectionID">90</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">takeCall:</string>
@@ -383,6 +417,15 @@
 					</object>
 					<int key="connectionID">68</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onSnapshotClick:</string>
+						<reference key="source" ref="317702958"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">91</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -410,6 +453,7 @@
 							<reference ref="903884486"/>
 							<reference ref="1051556672"/>
 							<reference ref="935863454"/>
+							<reference ref="317702958"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -475,6 +519,7 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">4</int>
 						<reference key="object" ref="1051556672"/>
+						<array class="NSMutableArray" key="children"/>
 						<reference key="parent" ref="191373211"/>
 						<string key="objectName">VideoView</string>
 					</object>
@@ -484,6 +529,12 @@
 						<reference key="parent" ref="935863454"/>
 						<string key="objectName">contactLabel</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">89</int>
+						<reference key="object" ref="317702958"/>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">Snapshot Button</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -514,6 +565,7 @@
 				<string key="8.object.labelIdentifier">IBBuiltInLabel-Red</string>
 				<string key="85.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="86.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="89.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="9.CustomClassName">UIMicroButton</string>
 				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="9.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -523,7 +575,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">88</int>
+			<int key="maxID">91</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -531,12 +583,12 @@
 					<string key="className">BuschJaegerCallView</string>
 					<string key="superclassName">UIViewController</string>
 					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="startCall:">id</string>
+						<string key="onSnapshotClick:">id</string>
 						<string key="takeCall:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="startCall:">
-							<string key="name">startCall:</string>
+						<object class="IBActionInfo" key="onSnapshotClick:">
+							<string key="name">onSnapshotClick:</string>
 							<string key="candidateClassName">id</string>
 						</object>
 						<object class="IBActionInfo" key="takeCall:">
@@ -552,6 +604,7 @@
 						<string key="lightsButton">UIDigitButton</string>
 						<string key="microButton">UIToggleButton</string>
 						<string key="openDoorButton">UIDigitButton</string>
+						<string key="snapshotButton">UIButton</string>
 						<string key="takeCallButton">UIButton</string>
 						<string key="videoView">UIView</string>
 					</dictionary>
@@ -584,6 +637,10 @@
 							<string key="name">openDoorButton</string>
 							<string key="candidateClassName">UIDigitButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="snapshotButton">
+							<string key="name">snapshotButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="takeCallButton">
 							<string key="name">takeCallButton</string>
 							<string key="candidateClassName">UIButton</string>
@@ -670,6 +727,7 @@
 			<string key="bj_mute_on.png">{160, 98}</string>
 			<string key="bj_start_call.png">{160, 98}</string>
 			<string key="icon5.png">{16, 16}</string>
+			<string key="snapshot.png">{44, 34}</string>
 		</dictionary>
 		<string key="IBCocoaTouchPluginVersion">1498</string>
 	</data>
diff --git a/Classes/BuschJaegerHistoryDetailsView.h b/Classes/BuschJaegerHistoryDetailsView.h
index 4be669b75..9acb94c43 100644
--- a/Classes/BuschJaegerHistoryDetailsView.h
+++ b/Classes/BuschJaegerHistoryDetailsView.h
@@ -33,6 +33,9 @@
 @property (nonatomic, retain) IBOutlet UITableViewController *tableController;
 @property (nonatomic, retain) IBOutlet UILabel *stationLabel;
 @property (nonatomic, retain) IBOutlet UILabel *dateLabel;
+
+@property (nonatomic, retain) IBOutlet UIView *fullscreenView;
+@property (nonatomic, retain) IBOutlet UIButton *saveButton;
 @property (nonatomic, retain) IBOutlet UIRemoteImageView *imageView;
 
 - (IBAction)onBackClick:(id)sender;
@@ -40,5 +43,6 @@
 - (IBAction)nextImage:(id)sender;
 - (IBAction)previousImage:(id)sender;
 - (IBAction)hideImage:(id)sender;
+- (IBAction)saveImage:(id)sender;
 
 @end
diff --git a/Classes/BuschJaegerHistoryDetailsView.m b/Classes/BuschJaegerHistoryDetailsView.m
index 115df8f00..959136f92 100644
--- a/Classes/BuschJaegerHistoryDetailsView.m
+++ b/Classes/BuschJaegerHistoryDetailsView.m
@@ -31,6 +31,8 @@
 @synthesize stationLabel;
 @synthesize dateLabel;
 @synthesize imageView;
+@synthesize saveButton;
+@synthesize fullscreenView;
 
 #pragma mark - Lifecycle Functions
 
@@ -72,8 +74,9 @@
     [backButton release];
     [stationLabel release];
     [dateLabel release];
-    
+    [fullscreenView release];
     [imageView release];
+    [saveButton release];
     
     [dateFormatter release];
     
@@ -98,7 +101,7 @@
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    [imageView setHidden:TRUE];
+    [fullscreenView setHidden:TRUE];
 }
 
 
@@ -157,9 +160,12 @@
 }
 
 - (IBAction)hideImage:(id)sender {
-    [imageView setHidden:TRUE];
+    [fullscreenView setHidden:TRUE];
 }
 
+- (IBAction)saveImage:(id)sender {
+    UIImageWriteToSavedPhotosAlbum([imageView image], nil, nil, nil);
+}
 
 #pragma mark - UITableViewDataSource Functions
 
@@ -195,7 +201,7 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     [tableView deselectRowAtIndexPath:indexPath animated:NO];
     currentIndex = [indexPath row];
-    [imageView setHidden:FALSE];
+    [fullscreenView setHidden:FALSE];
     [imageView setImage:nil];
     [imageView loadImage:[[LinphoneManager instance].configuration getImageUrl:BuschJaegerConfigurationRequestType_Local image:[history.images objectAtIndex:currentIndex]]];
 }
diff --git a/Classes/BuschJaegerHistoryDetailsView.xib b/Classes/BuschJaegerHistoryDetailsView.xib
index ddca9a114..1c13c6f59 100644
--- a/Classes/BuschJaegerHistoryDetailsView.xib
+++ b/Classes/BuschJaegerHistoryDetailsView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1296</int>
+		<int key="IBDocument.SystemTarget">1280</int>
 		<string key="IBDocument.SystemVersion">11E53</string>
 		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
 		<string key="IBDocument.AppKitVersion">1138.47</string>
@@ -98,7 +98,7 @@
 						<string key="NSFrame">{{168, 5}, {112, 21}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="252379384"/>
+						<reference key="NSNextKeyView" ref="1041038771"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -120,7 +120,7 @@
 							<int key="NSfFlags">16</int>
 						</object>
 					</object>
-					<object class="IBUIButton" id="252379384">
+					<object class="IBUIButton" id="1041038771">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">257</int>
 						<string key="NSFrame">{{286, 0}, {34, 34}}</string>
@@ -137,7 +137,7 @@
 						<double key="IBUIImageEdgeInsets.bottom">6</double>
 						<double key="IBUIImageEdgeInsets.left">6</double>
 						<double key="IBUIImageEdgeInsets.right">6</double>
-						<object class="NSColor" key="IBUINormalTitleShadowColor" id="1019592571">
+						<object class="NSColor" key="IBUINormalTitleShadowColor" id="198790443">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MC41AA</bytes>
 						</object>
@@ -145,11 +145,11 @@
 							<string key="NSClassName">NSImage</string>
 							<string key="NSResourceName">trash.png</string>
 						</object>
-						<object class="IBUIFontDescription" key="IBUIFontDescription" id="1060063880">
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="1025495200">
 							<int key="type">2</int>
 							<double key="pointSize">15</double>
 						</object>
-						<object class="NSFont" key="IBUIFont" id="364688920">
+						<object class="NSFont" key="IBUIFont" id="654524265">
 							<string key="NSName">Helvetica-Bold</string>
 							<double key="NSSize">15</double>
 							<int key="NSfFlags">16</int>
@@ -194,7 +194,6 @@
 								<string key="NSFrameSize">{280, 40}</string>
 								<reference key="NSSuperview" ref="794939656"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor" id="372315597">
 									<int key="NSColorSpace">3</int>
@@ -206,9 +205,9 @@
 								<int key="IBUIContentVerticalAlignment">0</int>
 								<reference key="IBUIHighlightedTitleColor" ref="541094472"/>
 								<reference key="IBUINormalTitleColor" ref="541094472"/>
-								<reference key="IBUINormalTitleShadowColor" ref="1019592571"/>
-								<reference key="IBUIFontDescription" ref="1060063880"/>
-								<reference key="IBUIFont" ref="364688920"/>
+								<reference key="IBUINormalTitleShadowColor" ref="198790443"/>
+								<reference key="IBUIFontDescription" ref="1025495200"/>
+								<reference key="IBUIFont" ref="654524265"/>
 							</object>
 						</array>
 						<string key="NSFrame">{{20, 410}, {280, 40}}</string>
@@ -219,28 +218,72 @@
 						<reference key="IBUIBackgroundColor" ref="372315597"/>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
-					<object class="IBUIImageView" id="322407382">
+					<object class="IBUIView" id="899524222">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="322407382">
+								<reference key="NSNextResponder" ref="899524222"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrameSize">{320, 460}</string>
+								<reference key="NSSuperview" ref="899524222"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="802025467"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<object class="NSColor" key="IBUIBackgroundColor" id="76823613">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MAA</bytes>
+								</object>
+								<int key="IBUIContentMode">1</int>
+								<bool key="IBUIMultipleTouchEnabled">YES</bool>
+								<array key="IBUIGestureRecognizers" id="0"/>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							</object>
+							<object class="IBUIButton" id="802025467">
+								<reference key="NSNextResponder" ref="899524222"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{266, 406}, {34, 34}}</string>
+								<reference key="NSSuperview" ref="899524222"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="33010100"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="IBUIOpaque">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<reference key="IBUIHighlightedTitleColor" ref="541094472"/>
+								<object class="NSColor" key="IBUINormalTitleColor">
+									<int key="NSColorSpace">1</int>
+									<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+								</object>
+								<reference key="IBUINormalTitleShadowColor" ref="198790443"/>
+								<object class="NSCustomResource" key="IBUINormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">bj_save.png</string>
+								</object>
+								<reference key="IBUIFontDescription" ref="1025495200"/>
+								<reference key="IBUIFont" ref="654524265"/>
+							</object>
+						</array>
 						<string key="NSFrameSize">{320, 460}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="33010100"/>
+						<reference key="NSNextKeyView" ref="322407382"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="76823613">
+						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MAA</bytes>
+							<bytes key="NSWhite">MQA</bytes>
+							<object class="NSColorSpace" key="NSCustomColorSpace">
+								<int key="NSID">2</int>
+							</object>
 						</object>
-						<int key="IBUIContentMode">1</int>
-						<bool key="IBUIMultipleTouchEnabled">YES</bool>
-						<array key="IBUIGestureRecognizers" id="0"/>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
 				</array>
 				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="322407382"/>
+				<reference key="NSNextKeyView" ref="899524222"/>
 				<reference key="IBUIBackgroundColor" ref="76823613"/>
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -310,6 +353,14 @@
 					</object>
 					<int key="connectionID">32</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">fullscreenView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="899524222"/>
+					</object>
+					<int key="connectionID">39</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">view</string>
@@ -343,6 +394,16 @@
 					</object>
 					<int key="connectionID">16</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletCollectionConnection" key="connection">
+						<string key="label">gestureRecognizers</string>
+						<reference key="source" ref="322407382"/>
+						<reference key="destination" ref="504152559"/>
+						<string key="cachedDesigntimeCollectionClassName">NSArray</string>
+						<bool key="addsContentToExistingCollection">NO</bool>
+					</object>
+					<int key="connectionID">31</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletCollectionConnection" key="connection">
 						<string key="label">gestureRecognizers</string>
@@ -363,16 +424,6 @@
 					</object>
 					<int key="connectionID">30</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletCollectionConnection" key="connection">
-						<string key="label">gestureRecognizers</string>
-						<reference key="source" ref="322407382"/>
-						<reference key="destination" ref="504152559"/>
-						<string key="cachedDesigntimeCollectionClassName">NSArray</string>
-						<bool key="addsContentToExistingCollection">NO</bool>
-					</object>
-					<int key="connectionID">31</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">hideImage:</string>
@@ -400,12 +451,21 @@
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">onDeleteClick:</string>
-						<reference key="source" ref="252379384"/>
+						<reference key="source" ref="1041038771"/>
 						<reference key="destination" ref="372490531"/>
 						<int key="IBEventType">7</int>
 					</object>
 					<int key="connectionID">37</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">saveImage:</string>
+						<reference key="source" ref="802025467"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">41</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -423,8 +483,8 @@
 							<reference ref="794939656"/>
 							<reference ref="420803874"/>
 							<reference ref="33010100"/>
-							<reference ref="322407382"/>
-							<reference ref="252379384"/>
+							<reference ref="1041038771"/>
+							<reference ref="899524222"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -482,12 +542,6 @@
 						<reference key="object" ref="390128791"/>
 						<reference key="parent" ref="794939656"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">21</int>
-						<reference key="object" ref="322407382"/>
-						<array class="NSMutableArray" key="children"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">23</int>
 						<reference key="object" ref="309092053"/>
@@ -507,9 +561,30 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">36</int>
-						<reference key="object" ref="252379384"/>
+						<reference key="object" ref="1041038771"/>
 						<reference key="parent" ref="191373211"/>
-						<string key="objectName">deleteButton</string>
+						<string key="objectName">Delete Button</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">38</int>
+						<reference key="object" ref="899524222"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="322407382"/>
+							<reference ref="802025467"/>
+						</array>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">Fullscreen View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="322407382"/>
+						<reference key="parent" ref="899524222"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">40</int>
+						<reference key="object" ref="802025467"/>
+						<reference key="parent" ref="899524222"/>
+						<string key="objectName">Save Button</string>
 					</object>
 				</array>
 			</object>
@@ -531,7 +606,9 @@
 				<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="2" key="36.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
 				<real value="0.0" key="36.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="38.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="40.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -540,7 +617,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">37</int>
+			<int key="maxID">41</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -553,6 +630,7 @@
 						<string key="onBackClick:">id</string>
 						<string key="onDeleteClick:">id</string>
 						<string key="previousImage:">id</string>
+						<string key="saveImage:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
 						<object class="IBActionInfo" key="hideImage:">
@@ -575,10 +653,15 @@
 							<string key="name">previousImage:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="saveImage:">
+							<string key="name">saveImage:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="backButton">UIView</string>
 						<string key="dateLabel">UILabel</string>
+						<string key="fullscreenView">UIView</string>
 						<string key="imageView">UIRemoteImageView</string>
 						<string key="stationLabel">UILabel</string>
 						<string key="tableController">UITableViewController</string>
@@ -592,6 +675,10 @@
 							<string key="name">dateLabel</string>
 							<string key="candidateClassName">UILabel</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="fullscreenView">
+							<string key="name">fullscreenView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="imageView">
 							<string key="name">imageView</string>
 							<string key="candidateClassName">UIRemoteImageView</string>
@@ -622,16 +709,12 @@
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1296" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NS.key.0">trash.png</string>
-			<string key="NS.object.0">{26, 26}</string>
-		</object>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="bj_save.png">{34, 35}</string>
+			<string key="trash.png">{26, 26}</string>
+		</dictionary>
 		<string key="IBCocoaTouchPluginVersion">1498</string>
 	</data>
 </archive>
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index f26b18bdf..1e2814205 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -217,7 +217,9 @@ struct codec_name_pref_table codec_pref_table[]={
         logs = [[NSMutableArray alloc] init];
         database = NULL;
         speakerEnabled = FALSE;
+        /* MODIFICATION: Disable database */
         [self openDatabase];
+        /**/
         [self copyDefaultSettings];
 
         /* MODIFICATION: Add buschjaeger configuration */
diff --git a/Resources/bj_save.png b/Resources/bj_save.png
new file mode 100644
index 000000000..c8271408e
Binary files /dev/null and b/Resources/bj_save.png differ
diff --git a/Resources/snapshot.png b/Resources/snapshot.png
new file mode 100644
index 000000000..8151dd3e8
Binary files /dev/null and b/Resources/snapshot.png differ
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 8bb172103..a434b9690 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -159,6 +159,10 @@
 		D376EAF116008454007C8226 /* ringtone_05_1600.wav in Resources */ = {isa = PBXBuildFile; fileRef = D376EAE716008454007C8226 /* ringtone_05_1600.wav */; };
 		D376EAF416008DF1007C8226 /* User.m in Sources */ = {isa = PBXBuildFile; fileRef = D376EAF316008DF1007C8226 /* User.m */; };
 		D376EAF516008DF1007C8226 /* User.m in Sources */ = {isa = PBXBuildFile; fileRef = D376EAF316008DF1007C8226 /* User.m */; };
+		D376EAF816009E2A007C8226 /* bj_save.png in Resources */ = {isa = PBXBuildFile; fileRef = D376EAF616009E2A007C8226 /* bj_save.png */; };
+		D376EAF916009E2A007C8226 /* bj_save.png in Resources */ = {isa = PBXBuildFile; fileRef = D376EAF616009E2A007C8226 /* bj_save.png */; };
+		D376EAFA16009E2A007C8226 /* snapshot.png in Resources */ = {isa = PBXBuildFile; fileRef = D376EAF716009E2A007C8226 /* snapshot.png */; };
+		D376EAFB16009E2A007C8226 /* snapshot.png in Resources */ = {isa = PBXBuildFile; fileRef = D376EAF716009E2A007C8226 /* snapshot.png */; };
 		D37CD2DF15E21CB30028869A /* bj_barcode.png in Resources */ = {isa = PBXBuildFile; fileRef = D37CD2C615E21CB30028869A /* bj_barcode.png */; };
 		D37CD2E015E21CB30028869A /* bj_barcode.png in Resources */ = {isa = PBXBuildFile; fileRef = D37CD2C615E21CB30028869A /* bj_barcode.png */; };
 		D37CD2E115E21CB30028869A /* bj_decline.png in Resources */ = {isa = PBXBuildFile; fileRef = D37CD2C715E21CB30028869A /* bj_decline.png */; };
@@ -593,6 +597,8 @@
 		D376EAE716008454007C8226 /* ringtone_05_1600.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ringtone_05_1600.wav; path = Resources/ringtone_05_1600.wav; sourceTree = "<group>"; };
 		D376EAF216008DF1007C8226 /* User.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = User.h; path = Model/User.h; sourceTree = "<group>"; };
 		D376EAF316008DF1007C8226 /* User.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = User.m; path = Model/User.m; sourceTree = "<group>"; };
+		D376EAF616009E2A007C8226 /* bj_save.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bj_save.png; path = Resources/bj_save.png; sourceTree = "<group>"; };
+		D376EAF716009E2A007C8226 /* snapshot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = snapshot.png; path = Resources/snapshot.png; sourceTree = "<group>"; };
 		D37CD2C615E21CB30028869A /* bj_barcode.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bj_barcode.png; path = Resources/bj_barcode.png; sourceTree = "<group>"; };
 		D37CD2C715E21CB30028869A /* bj_decline.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bj_decline.png; path = Resources/bj_decline.png; sourceTree = "<group>"; };
 		D37CD2C815E21CB30028869A /* bj_door_hl.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bj_door_hl.png; path = Resources/bj_door_hl.png; sourceTree = "<group>"; };
@@ -1268,6 +1274,7 @@
 				D37CD2CB15E21CB30028869A /* bj_light_hl.png */,
 				D37CD2CD15E21CB30028869A /* bj_mute_off.png */,
 				D37CD2CE15E21CB30028869A /* bj_mute_on.png */,
+				D376EAF616009E2A007C8226 /* bj_save.png */,
 				D37CD2CF15E21CB30028869A /* bj_settings.png */,
 				D37CD2D015E21CB30028869A /* bj_start_call.png */,
 				D384466E15E64B9E00DF89DF /* bj_station.png */,
@@ -1287,6 +1294,7 @@
 				D376EAE616008454007C8226 /* ringtone_04_1600.wav */,
 				D376EAE716008454007C8226 /* ringtone_05_1600.wav */,
 				D33BEE1E15FF711B004ED2AF /* rootca.pem */,
+				D376EAF716009E2A007C8226 /* snapshot.png */,
 				D376EAE0160082A4007C8226 /* trash.png */,
 			);
 			name = Resources;
@@ -1538,6 +1546,8 @@
 				D376EAEC16008454007C8226 /* ringtone_03_1600.wav in Resources */,
 				D376EAEE16008454007C8226 /* ringtone_04_1600.wav in Resources */,
 				D376EAF016008454007C8226 /* ringtone_05_1600.wav in Resources */,
+				D376EAF816009E2A007C8226 /* bj_save.png in Resources */,
+				D376EAFA16009E2A007C8226 /* snapshot.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1590,6 +1600,8 @@
 				D376EAED16008454007C8226 /* ringtone_03_1600.wav in Resources */,
 				D376EAEF16008454007C8226 /* ringtone_04_1600.wav in Resources */,
 				D376EAF116008454007C8226 /* ringtone_05_1600.wav in Resources */,
+				D376EAF916009E2A007C8226 /* bj_save.png in Resources */,
+				D376EAFB16009E2A007C8226 /* snapshot.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};